The Unified and Autonomous Development Platform
Able to specify build/issue/pullrequest related field globally in various queries
Robin Shenaa40b5085b0f
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.javaindex cff9dcd239..318a6be372 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java@@ -88,8 +88,9 @@ import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.security.CodePullAuthorizationSource;+import io.onedev.server.security.permission.AccessBuild;+import io.onedev.server.security.permission.JobPermission;import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.ReadCode;import io.onedev.server.util.BuildCommitAware;import io.onedev.server.util.JobLogger;import io.onedev.server.util.patternset.PatternSet;@@ -273,11 +274,6 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz} else {subject = User.asSubject(0L);}- if (!subject.isPermitted(new ProjectPermission(dependencyProject, new ReadCode()))) {- throw new OneException("Unable to access dependency project '"- + dependency.getProjectName() + "': permission denied");- }-String buildNumberStr = build.interpolate(dependency.getBuildNumber());if (buildNumberStr.startsWith("#"))buildNumberStr = buildNumberStr.substring(1);@@ -288,6 +284,13 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizdependency.getProjectName(), buildNumber);throw new OneException(errorMessage);}++ JobPermission jobPermission = new JobPermission(dependencyBuild.getJobName(), new AccessBuild());+ if (!subject.isPermitted(new ProjectPermission(dependencyProject, jobPermission))) {+ throw new OneException("Unable to access dependency build '"+ + dependency.getProjectName() + "#" + dependencyBuild.getNumber() + "': permission denied");+ }+BuildDependence dependence = new BuildDependence();dependence.setDependency(dependencyBuild);dependence.setDependent(build);diff --git a/server-core/src/main/java/io/onedev/server/ci/job/Job.java b/server-core/src/main/java/io/onedev/server/ci/job/Job.javaindex 9526b0cc31..5227e5efef 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/Job.java@@ -16,6 +16,7 @@ import java.util.Set;import javax.validation.ConstraintValidatorContext;import javax.validation.Valid;+import javax.validation.constraints.Pattern;import javax.validation.constraints.Size;import org.apache.wicket.Component;@@ -102,6 +103,7 @@ public class Job implements Serializable, Validatable {private transient Map<String, ParamSpec> paramSpecMap;@Editable(order=100, description="Specify name of the job")+ @Pattern(regexp="[^:]*", message="Character ':' is not allowed") // ':' will be used as project/job separator in build query@NotEmptypublic String getName() {return name;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.javaindex 292f378e1b..05647fa5d2 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java@@ -15,6 +15,8 @@ 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;import io.onedev.server.util.interpolative.Segment;@@ -55,8 +57,9 @@ public class ProjectDependency implements Serializable {private static List<String> getProjectChoices() {List<String> choices = new ArrayList<>();Project project = ((ProjectPage)WicketUtils.getPage()).getProject();- for (Project each: OneDev.getInstance(ProjectManager.class).query()) {- if (!each.equals(project) && SecurityUtils.canReadCode(each))+ User user = SecurityUtils.getUser();+ for (Project each: OneDev.getInstance(ProjectManager.class).getPermittedProjects(user, 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 7e116d08d2..5c419e9b06 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@@ -21,6 +21,9 @@ public interface BuildManager extends EntityManager<Build> {@NullableBuild find(Project project, long number);+ @Nullable+ Build find(String buildFQN);+Build findStreamPrevious(Build build, @Nullable Build.Status status);Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName, Map<String, List<String>> params);@@ -35,9 +38,10 @@ public interface BuildManager extends EntityManager<Build> {Collection<Build> queryUnfinished();- List<Build> query(Project project, @Nullable User user, String term, int count);+ List<Build> query(@Nullable Project project, @Nullable User user, 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, @Nullable User user,+ EntityQuery<Build> buildQuery, int firstResult, int maxResults);int count(@Nullable Project project, @Nullable User user, EntityCriteria<Build> buildCriteria);@@ -45,6 +49,8 @@ public interface BuildManager extends EntityManager<Build> {Collection<Long> filterBuildIds(Long projectId, Collection<String> commitHashes);- Collection<String> getJobNames(@Nullable Long projectId);+ Collection<String> getJobNames();++ Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project, @Nullable User user);}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 5a3b8d4189..f7499a58ca 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@@ -24,13 +24,17 @@ public interface IssueManager extends EntityManager<Issue> {@NullableIssue find(Project project, long number);+ @Nullable+ Issue find(String issueFQN);+void open(Issue issue);- List<Issue> query(@Nullable Project project, @Nullable User user, EntityQuery<Issue> issueQuery, int firstResult, int maxResults);+ List<Issue> query(@Nullable Project project, @Nullable User user, EntityQuery<Issue> issueQuery,+ int firstResult, int maxResults);int count(@Nullable Project project, @Nullable User user, @Nullable IssueCriteria issueCriteria);- List<Issue> query(Project project, @Nullable String term, int count);+ List<Issue> query(Project project, String term, int count);int count(Milestone milestone, @Nullable User user, @Nullable StateSpec.Category category);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.javaindex 1f3aaeae7b..5dc5dbf8dd 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java@@ -14,5 +14,7 @@ public interface MilestoneManager extends EntityManager<Milestone> {void delete(Milestone milestone, @Nullable Milestone moveIssuesToMilestone);void close(Milestone milestone, @Nullable Milestone moveOpenIssuesToMilestone);++ Milestone find(String milestoneFQN);}\ No newline at end of filediff --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 0114c0da5f..daf8838e37 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@@ -8,12 +8,12 @@ import javax.annotation.Nullable;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.util.ProjectAndBranch;public interface PullRequestManager extends EntityManager<PullRequest> {@@ -30,6 +30,9 @@ public interface PullRequestManager extends EntityManager<PullRequest> {@NullablePullRequest find(Project targetProject, long number);+ @Nullable+ PullRequest find(String pullRequestFQN);+@NullablePullRequest findLatest(Project targetProject, User submitter);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 6c52196f64..0bfde86ac0 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@@ -8,7 +8,6 @@ import java.util.HashSet;import java.util.Iterator;import java.util.List;import java.util.Map;-import java.util.Set;import java.util.concurrent.Callable;import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.locks.ReadWriteLock;@@ -55,6 +54,7 @@ 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.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;@@ -104,6 +104,8 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsprivate final GroupManager groupManager;+ private final ProjectManager projectManager;+private final TaskScheduler taskScheduler;private final TransactionManager transactionManager;@@ -112,18 +114,23 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsprivate final ReadWriteLock buildsLock = new ReentrantReadWriteLock();+ private final Map<Long, Collection<String>> jobNames = new HashMap<>();++ private final ReadWriteLock jobNamesLock = new ReentrantReadWriteLock();+private String taskId;@Injectpublic DefaultBuildManager(Dao dao, BuildParamManager buildParamManager,TaskScheduler taskScheduler, BuildDependenceManager buildDependenceManager,GroupManager groupManager, StorageManager storageManager,- TransactionManager transactionManager) {+ ProjectManager projectManager, TransactionManager transactionManager) {super(dao);this.buildParamManager = buildParamManager;this.buildDependenceManager = buildDependenceManager;this.storageManager = storageManager;this.groupManager = groupManager;+ this.projectManager = projectManager;this.taskScheduler = taskScheduler;this.transactionManager = transactionManager;}@@ -158,6 +165,24 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementscriteria.setCacheable(true);return find(criteria);}++ @Sessional+ @Override+ public Build find(String buildFQN) {+ String projectName = StringUtils.substringBefore(buildFQN, "#");+ Project project = projectManager.find(projectName);+ if (project != null) {+ String buildNumberStr = StringUtils.substringAfter(buildFQN, "#");+ try {+ Long buildNumber = Long.valueOf(buildNumberStr);+ return find(project, buildNumber);+ } catch (NumberFormatException e) {+ throw new OneException("Invalid build number: " + buildNumberStr);+ }+ } else {+ return null;+ }+ }@Transactional@Override@@ -165,6 +190,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementssuper.save(build);BuildFacade facade = build.getFacade();+ String jobName = build.getJobName();transactionManager.runAfterCommit(new Runnable() {@Override@@ -175,6 +201,12 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements} finally {buildsLock.writeLock().unlock();}+ jobNamesLock.writeLock().lock();+ try {+ populateJobNames(facade.getProjectId(), jobName);+ } finally {+ jobNamesLock.writeLock().unlock();+ }}});@@ -199,6 +231,15 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements} finally {buildsLock.writeLock().unlock();}+ jobNamesLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, Collection<String>>> it = jobNames.entrySet().iterator(); it.hasNext();) {+ if (it.next().getKey().equals(projectId))+ it.remove();+ }+ } finally {+ jobNamesLock.writeLock().unlock();+ }}});}@@ -261,28 +302,24 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Sessional@Override- public List<Build> query(Project project, User user, String term, int count) {+ public List<Build> query(Project project, @Nullable User user, String term, int count) {List<Build> builds = new ArrayList<>();EntityCriteria<Build> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- if (!User.asSubject(user).isPermitted(new ProjectPermission(project, new ManageProject()))) {+ criteria.add(Restrictions.eq(BuildConstants.ATTR_PROJECT, project));++ Subject subject = User.asSubject(user);+ if (!subject.isPermitted(new ProjectPermission(project, new ManageProject()))) {List<Criterion> jobCriterions = new ArrayList<>();- for (String jobName: getAccessibleJobNames(project, user))- jobCriterions.add(Restrictions.eq("jobName", jobName));+ for (String jobName: getAccessibleJobNames(project, user).get(project))+ jobCriterions.add(Restrictions.eq(BuildConstants.ATTR_JOB, jobName));criteria.add(Restrictions.or(jobCriterions.toArray(new Criterion[jobCriterions.size()])));}-- if (StringUtils.isNotBlank(term)) {- if (term.startsWith("#")) {- term = term.substring(1);- try {- long buildNumber = Long.parseLong(term);- criteria.add(Restrictions.eq("number", buildNumber));- } catch (NumberFormatException e) {- criteria.add(Restrictions.ilike("version", "#" + term, MatchMode.ANYWHERE));- }- } else try {++ if (term.startsWith("#"))+ term = term.substring(1);+ if (term.length() != 0) {+ try {long buildNumber = Long.parseLong(term);criteria.add(Restrictions.eq("number", buildNumber));} catch (NumberFormatException e) {@@ -319,13 +356,13 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementspredicates.add(builder.equal(root.get(BuildConstants.ATTR_PROJECT), project));if (!subject.isPermitted(new ProjectPermission(project, new ManageProject()))) {List<Predicate> jobPredicates = new ArrayList<>();- for (String jobName: getAccessibleJobNames(project, user))+ for (String jobName: getAccessibleJobNames(project, user).get(project))jobPredicates.add(builder.equal(root.get(BuildConstants.ATTR_JOB), jobName));predicates.add(builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()])));}} else if (!subject.isPermitted(new SystemAdministration())) {List<Predicate> projectPredicates = new ArrayList<>();- for (Map.Entry<Project, Collection<String>> entry: getAccessibleJobNames(user).entrySet()) {+ for (Map.Entry<Project, Collection<String>> entry: getAccessibleJobNames(null, user).entrySet()) {if (subject.isPermitted(new ProjectPermission(project, new ManageProject()))) {projectPredicates.add(builder.equal(root.get(BuildConstants.ATTR_PROJECT), entry.getKey()));} else {@@ -341,7 +378,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements}if (criteria != null)- predicates.add(criteria.getPredicate(project, root, builder, user));+ predicates.add(criteria.getPredicate(root, builder, user));return predicates.toArray(new Predicate[0]);}@@ -506,7 +543,9 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsQuery<?> query = dao.getSession().createQuery("select id, project.id, commitHash, jobName from Build");for (Object[] fields: (List<Object[]>)query.list()) {Long buildId = (Long) fields[0];- builds.put(buildId, new BuildFacade(buildId, (Long)fields[1], (String)fields[2], (String)fields[3]));+ Long projectId = (Long)fields[1];+ builds.put(buildId, new BuildFacade(buildId, projectId, (String)fields[2]));+ populateJobNames(projectId, (String)fields[3]);}taskId = taskScheduler.schedule(this);}@@ -586,59 +625,46 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsbuildsLock.readLock().unlock();}}-- @Override- public Collection<String> getJobNames(Long projectId) {- buildsLock.readLock().lock();- try {- Set<String> jobNames = new HashSet<>();- for (BuildFacade build: builds.values()) {- if (projectId == null || projectId.equals(build.getProjectId()))- jobNames.add(build.getJobName());- }- return jobNames;- } finally {- buildsLock.readLock().unlock();++ private void populateJobNames(Long projectId, String jobName) {+ Collection<String> jobNamesOfProject = jobNames.get(projectId);+ if (jobNamesOfProject == null) {+ jobNamesOfProject = new HashSet<>();+ jobNames.put(projectId, jobNamesOfProject);}+ jobNamesOfProject.add(jobName);}private Collection<String> getAccessibleJobNames(Role role, Collection<String> jobNames) {- StringMatcher matcher = new StringMatcher();Collection<String> accessibleJobNames = new HashSet<>();- for (JobPrivilege jobPrivilege: role.getJobPrivileges()) {- for (String jobName: jobNames) {- if (PatternSet.fromString(jobPrivilege.getJobNames()).matches(matcher, jobName))- accessibleJobNames.add(jobName);+ if (role.isManageProject()) {+ accessibleJobNames.addAll(jobNames);+ } else {+ StringMatcher matcher = new StringMatcher();+ for (JobPrivilege jobPrivilege: role.getJobPrivileges()) {+ PatternSet patternSet = PatternSet.fromString(jobPrivilege.getJobNames());+ for (String jobName: jobNames) {+ if (patternSet.matches(matcher, jobName))+ accessibleJobNames.add(jobName);+ }}}return accessibleJobNames;}-- private Collection<String> getAccessibleJobNames(Project project, User user) {- Collection<String> jobNames = getJobNames(project.getId());- Collection<String> accessibleJobNames = new HashSet<>();- if (user != null) {- for (UserAuthorization authorization: user.getProjectAuthorizations()) {- if (authorization.getProject().equals(project))- accessibleJobNames.addAll(getAccessibleJobNames(authorization.getRole(), jobNames));- }- for (Group group: user.getGroups()) {- for (GroupAuthorization authorization: group.getProjectAuthorizations()) {- if (authorization.getProject().equals(project))- accessibleJobNames.addAll(getAccessibleJobNames(authorization.getRole(), jobNames));- }- }- }- Group group = groupManager.findAnonymous();- if (group != null) {- for (GroupAuthorization authorization: group.getProjectAuthorizations()) {- if (authorization.getProject().equals(project))- accessibleJobNames.addAll(getAccessibleJobNames(authorization.getRole(), jobNames));- }++ @Override+ public Collection<String> getJobNames() {+ jobNamesLock.readLock().lock();+ try {+ Collection<String> jobNames = new HashSet<>();+ for (Collection<String> each: this.jobNames.values())+ jobNames.addAll(each);+ return jobNames;+ } finally {+ jobNamesLock.readLock().unlock();}- return accessibleJobNames;}-+private void populateAccessibleJobNames(Map<Project, Collection<String>> accessibleJobNames,Map<Long, Collection<String>> jobNames, Project project, Role role) {Collection<String> jobNamesOfProject = jobNames.get(project.getId());@@ -653,37 +679,48 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements}}- private Map<Project, Collection<String>> getAccessibleJobNames(User user) {- Map<Long, Collection<String>> jobNames = new HashMap<>();- buildsLock.readLock().lock();+ @Override+ public Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project, @Nullable User user) {+ jobNamesLock.readLock().lock();try {- for (BuildFacade build: builds.values()) {- Collection<String> jobNamesOfProject = jobNames.get(build.getProjectId());- if (jobNamesOfProject == null) {- jobNamesOfProject = new HashSet<>();- jobNames.put(build.getId(), jobNamesOfProject);+ Map<Project, Collection<String>> accessibleJobNames = new HashMap<>();+ Subject subject = User.asSubject(user);+ if (subject.isPermitted(new SystemAdministration())) {+ for (Map.Entry<Long, Collection<String>> entry: jobNames.entrySet())+ accessibleJobNames.put(projectManager.load(entry.getKey()), new HashSet<>(entry.getValue()));+ } else {+ if (user != null) {+ for (UserAuthorization authorization: user.getProjectAuthorizations()) {+ if (project == null || project.equals(authorization.getProject())) {+ populateAccessibleJobNames(accessibleJobNames, jobNames,+ authorization.getProject(), authorization.getRole());+ }+ }+ for (Group group: user.getGroups()) {+ for (GroupAuthorization authorization: group.getProjectAuthorizations()) {+ if (project == null || project.equals(authorization.getProject())) {+ populateAccessibleJobNames(accessibleJobNames, jobNames,+ authorization.getProject(), authorization.getRole());+ }+ }+ }+ }+ Group group = groupManager.findAnonymous();+ if (group != null) {+ for (GroupAuthorization authorization: group.getProjectAuthorizations()) {+ if (project == null || project.equals(authorization.getProject())) {+ populateAccessibleJobNames(accessibleJobNames, jobNames,+ authorization.getProject(), authorization.getRole());+ }+ }}- jobNamesOfProject.add(build.getJobName());}+ if (project != null && !accessibleJobNames.containsKey(project))+ accessibleJobNames.put(project, new HashSet<>());+ return accessibleJobNames;} finally {- buildsLock.readLock().unlock();- }-- Map<Project, Collection<String>> accessibleJobNames = new HashMap<>();- if (user != null) {- for (UserAuthorization authorization: user.getProjectAuthorizations())- populateAccessibleJobNames(accessibleJobNames, jobNames, authorization.getProject(), authorization.getRole());- for (Group group: user.getGroups()) {- for (GroupAuthorization authorization: group.getProjectAuthorizations())- populateAccessibleJobNames(accessibleJobNames, jobNames, authorization.getProject(), authorization.getRole());- }+ jobNamesLock.readLock().unlock();}- Group group = groupManager.findAnonymous();- if (group != null) {- for (GroupAuthorization authorization: group.getProjectAuthorizations())- populateAccessibleJobNames(accessibleJobNames, jobNames, authorization.getProject(), authorization.getRole());- }- return accessibleJobNames;}}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 e6e3daef72..d20428bfc4 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@@ -243,10 +243,10 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeCommentJoin<?, ?> relations = root.join(CodeCommentConstants.ATTR_RELATIONS, JoinType.INNER);relations.on(builder.equal(relations.get(CodeCommentRelation.ATTR_REQUEST), request));} else {- predicates.add(builder.equal(root.get("project"), project));+ predicates.add(builder.equal(root.get(CodeCommentConstants.ATTR_PROJECT), project));}if (criteria != null)- predicates.add(criteria.getPredicate(project, root, builder, user));+ predicates.add(criteria.getPredicate(root, builder, user));return predicates.toArray(new Predicate[0]);}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 5d87149328..e3826af138 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@@ -34,6 +34,7 @@ import com.google.common.base.Preconditions;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.server.OneException;import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.IssueQuerySettingManager;@@ -139,6 +140,24 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsreturn find(criteria);}+ @Sessional+ @Override+ public Issue find(String issueFQN) {+ String projectName = StringUtils.substringBefore(issueFQN, "#");+ Project project = projectManager.find(projectName);+ if (project != null) {+ String issueNumberStr = StringUtils.substringAfter(issueFQN, "#");+ try {+ Long issueNumber = Long.valueOf(issueNumberStr);+ return find(project, issueNumber);+ } catch (NumberFormatException e) {+ throw new OneException("Invalid issue number: " + issueNumberStr);+ }+ } else {+ return null;+ }+ }+@Transactional@Overridepublic void open(Issue issue) {@@ -178,7 +197,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Nullable Project project, Root<Issue> root, CriteriaBuilder builder, @Nullable User user) {List<Predicate> predicates = new ArrayList<>();if (project != null) {- predicates.add(builder.equal(root.get("project"), project));+ predicates.add(builder.equal(root.get(IssueConstants.ATTR_PROJECT), project));} else if (!User.asSubject(user).isPermitted(new SystemAdministration())) {List<Predicate> projectPredicates = new ArrayList<>();for (Project each: projectManager.getPermittedProjects(user, new AccessProject()))@@ -186,7 +205,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementspredicates.add(builder.or(projectPredicates.toArray(new Predicate[projectPredicates.size()])));}if (criteria != null)- predicates.add(criteria.getPredicate(project, root, builder, user));+ predicates.add(criteria.getPredicate(root, builder, user));return predicates.toArray(new Predicate[0]);}@@ -349,24 +368,16 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Override- public List<Issue> query(Project project, @Nullable String term, int count) {+ public List<Issue> query(Project project, String term, int count) {List<Issue> issues = new ArrayList<>();EntityCriteria<Issue> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));+ criteria.add(Restrictions.eq(IssueConstants.ATTR_PROJECT, project));- if (StringUtils.isNotBlank(term)) {- if (term.startsWith("#")) {- term = term.substring(1);- try {- long buildNumber = Long.parseLong(term);- criteria.add(Restrictions.eq("number", buildNumber));- } catch (NumberFormatException e) {- criteria.add(Restrictions.or(- Restrictions.ilike("title", "#" + term, MatchMode.ANYWHERE),- Restrictions.ilike("noSpaceTitle", "#" + term, MatchMode.ANYWHERE)));- }- } else try {+ if (term.startsWith("#"))+ term = term.substring(1);+ if (term.length() != 0) {+ try {long buildNumber = Long.parseLong(term);criteria.add(Restrictions.eq("number", buildNumber));} catch (NumberFormatException e) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.javaindex b4b03c345c..592e921816 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java@@ -15,6 +15,7 @@ import com.google.common.base.Preconditions;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.StringUtils;import io.onedev.server.entitymanager.MilestoneManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.issue.IssueChangeEvent;@@ -38,16 +39,30 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> imprivate final SettingManager settingManager;+ private final ProjectManager projectManager;+@Inject- public DefaultMilestoneManager(Dao dao, SettingManager settingManager) {+ public DefaultMilestoneManager(Dao dao, SettingManager settingManager, ProjectManager projectManager) {super(dao);this.settingManager = settingManager;+ this.projectManager = projectManager;}private IssueSetting getIssueSetting() {return settingManager.getIssueSetting();}+ @Sessional+ @Override+ public Milestone find(String milestoneFQN) {+ String projectName = StringUtils.substringBefore(milestoneFQN, ":");+ Project project = projectManager.find(projectName);+ if (project != null)+ return find(project, StringUtils.substringAfter(milestoneFQN, ":"));+ else+ return null;+ }+@Transactional@Overridepublic void delete(Milestone milestone, @Nullable Milestone moveIssuesToMilestone) {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 094d233732..205abc772b 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@@ -11,6 +11,7 @@ import java.util.List;import java.util.Map;import java.util.concurrent.ConcurrentHashMap;+import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;@@ -63,6 +64,7 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.Usage;import io.onedev.server.util.patternset.PatternSet;@@ -407,10 +409,10 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem}@Override- public Collection<Project> getPermittedProjects(User user, Permission permission) {+ public Collection<Project> getPermittedProjects(@Nullable User user, Permission permission) {Collection<Project> projects = new HashSet<>();- if (SecurityUtils.isAdministrator()) {+ if (User.asSubject(user).isPermitted(new SystemAdministration())) {projects.addAll(query());} else {if (user != null) {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 926a56f414..aa1f8137d4 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@@ -97,7 +97,6 @@ import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.User;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.FileProtection;-import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;@@ -126,6 +125,7 @@ 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.PullRequestConstants;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.markdown.MarkdownManager;@@ -965,7 +965,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}if (criteria != null)- predicates.add(criteria.getPredicate(targetProject, root, builder, user));+ predicates.add(criteria.getPredicate(root, builder, user));return predicates.toArray(new Predicate[0]);}@@ -1066,24 +1066,34 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Override- public List<PullRequest> query(Project targetProject, @Nullable String term, int count) {+ public PullRequest find(String pullRequestFQN) {+ String projectName = StringUtils.substringBefore(pullRequestFQN, "#");+ Project project = projectManager.find(projectName);+ if (project != null) {+ String pullRequestNumberStr = StringUtils.substringAfter(pullRequestFQN, "#");+ try {+ Long pullRequestNumber = Long.valueOf(pullRequestNumberStr);+ return find(project, pullRequestNumber);+ } catch (NumberFormatException e) {+ throw new OneException("Invalid pull request number: " + pullRequestNumberStr);+ }+ } else {+ return null;+ }+ }++ @Sessional+ @Override+ public List<PullRequest> query(Project project, String term, int count) {List<PullRequest> requests = new ArrayList<>();EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(Restrictions.eq("targetProject", targetProject));+ criteria.add(Restrictions.eq(PullRequestConstants.ATTR_TARGET_PROJECT, project));- if (StringUtils.isNotBlank(term)) {- if (term.startsWith("#")) {- term = term.substring(1);- try {- long buildNumber = Long.parseLong(term);- criteria.add(Restrictions.eq("number", buildNumber));- } catch (NumberFormatException e) {- criteria.add(Restrictions.or(- Restrictions.ilike("title", "#" + term, MatchMode.ANYWHERE),- Restrictions.ilike("noSpaceTitle", "#" + term, MatchMode.ANYWHERE)));- }- } else try {+ if (term.startsWith("#"))+ term = term.substring(1);+ if (term.length() != 0) {+ try {long buildNumber = Long.parseLong(term);criteria.add(Restrictions.eq("number", buildNumber));} catch (NumberFormatException e) {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 1e9dd9e2eb..5bfa7317b6 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@@ -501,7 +501,7 @@ public class Build extends AbstractEntity implements Referenceable {}public BuildFacade getFacade() {- return new BuildFacade(getId(), getProject().getId(), getCommitHash(), getJobName());+ return new BuildFacade(getId(), getProject().getId(), getCommitHash());}public Collection<String> getSecretValuesToMask() {diff --git a/server-core/src/main/java/io/onedev/server/model/Milestone.java b/server-core/src/main/java/io/onedev/server/model/Milestone.javaindex 1ca2c90c27..5222867309 100644--- a/server-core/src/main/java/io/onedev/server/model/Milestone.java+++ b/server-core/src/main/java/io/onedev/server/model/Milestone.java@@ -13,6 +13,7 @@ import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.UniqueConstraint;import javax.validation.constraints.NotNull;+import javax.validation.constraints.Pattern;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@@ -32,7 +33,7 @@ public class Milestone extends AbstractEntity {private static final long serialVersionUID = 1L;- public static final String FIELD_ATTR_NAME = "name";+ public static final String ATTR_NAME = "name";@ManyToOne@JoinColumn(nullable=false)@@ -64,6 +65,7 @@ public class Milestone extends AbstractEntity {}@Editable(order=100)+ @Pattern(regexp="[^:]*", message="Character ':' is not allowed") // ':' will be used as project/milestone separator in issue query@NotEmptypublic String getName() {return name;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 8469f0c794..a084fc389a 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@@ -47,12 +47,12 @@ import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.GitUtils;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.EntityWatch;-import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.storage.AttachmentStorageSupport;import io.onedev.server.util.IssueUtils;+import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.Referenceable;import io.onedev.server.util.SecurityUtils;diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javaindex 0aad35d3e3..9cfc53a4b0 100644--- a/server-core/src/main/java/io/onedev/server/model/Role.java+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -20,6 +20,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.role.CodePrivilege;import io.onedev.server.model.support.role.JobPrivilege;import io.onedev.server.security.permission.AccessBuild;@@ -216,7 +217,8 @@ public class Role extends AbstractEntity implements Permission {} else {if (manageProject) {permissions.add(new ReadCode());- permissions.add(new AccessProject());+ for (FieldSpec field: OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpecs())+ permissions.add(new EditIssueField(field.getName()));permissions.add(new JobPermission("*", new AccessBuildLog()));} else {if (codePrivilege != CodePrivilege.NONE)diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.javaindex bfeda04864..7b0231d5bc 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.java@@ -225,13 +225,14 @@ public class IssueSetting implements Serializable {listFields.add("Assignee");namedQueries.add(new NamedIssueQuery("Open", "\"State\" is \"Open\""));- namedQueries.add(new NamedIssueQuery("My open", "\"State\" is \"Open\" and mine"));+ namedQueries.add(new NamedIssueQuery("Assigned to me & Open", "\"Assignee\" is me and \"State\" is \"Open\""));+ namedQueries.add(new NamedIssueQuery("Submitted by me & Open", "submitted by me and \"State\" is \"Open\""));+ namedQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignee\" is me"));+ namedQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));namedQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));namedQueries.add(new NamedIssueQuery("Updated recently", "\"Update Date\" is after \"last week\""));- namedQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));- namedQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignee\" is me"));- namedQueries.add(new NamedIssueQuery("Critical open", "\"State\" is \"Open\" and \"Priority\" is \"Critical\""));- namedQueries.add(new NamedIssueQuery("Unassigned open", "\"State\" is \"Open\" and \"Assignee\" is empty"));+ namedQueries.add(new NamedIssueQuery("Open & Critical", "\"State\" is \"Open\" and \"Priority\" is \"Critical\""));+ namedQueries.add(new NamedIssueQuery("Open & Unassigned", "\"State\" is \"Open\" and \"Assignee\" is empty"));namedQueries.add(new NamedIssueQuery("Closed", "\"State\" is \"Closed\""));namedQueries.add(new NamedIssueQuery("All", "all"));}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.javaindex 3b0f005cd6..761356b5fb 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java@@ -82,7 +82,7 @@ public abstract class JobExecutor implements Serializable {@Editable(order=10200, group="Job Applicability",description="Optionally specify space-separated jobs applicable for this executor. "+ "Use * or ? for wildcard match. Leave empty to match all")- @Patterns(suggester = "suggestJobNames")+ @Patterns@NameOfEmptyValue("All")public String getApplicableJobNames() {return applicableJobNames;@@ -94,7 +94,7 @@ public abstract class JobExecutor implements Serializable {@SuppressWarnings("unused")private static List<InputSuggestion> suggestJobNames(String matchWith) {- List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class).getJobNames(null));+ List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class).getJobNames());Collections.sort(jobNames);return SuggestionUtils.suggest(jobNames, matchWith);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/BuildChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/BuildChoiceInput.javaindex 900d3f54a9..18f0109fdb 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/BuildChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/BuildChoiceInput.java@@ -40,7 +40,7 @@ public class BuildChoiceInput {public static List<String> convertToStrings(Object value) {if (value instanceof Long)- return Lists.newArrayList((String) value);+ return Lists.newArrayList(value.toString());elsereturn new ArrayList<>();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/IssueChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/IssueChoiceInput.javaindex a887f2630b..5eda016048 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/IssueChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/IssueChoiceInput.java@@ -40,7 +40,7 @@ public class IssueChoiceInput {public static List<String> convertToStrings(Object value) {if (value instanceof Long)- return Lists.newArrayList((String) value);+ return Lists.newArrayList(value.toString());elsereturn new ArrayList<>();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/PullRequestChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/PullRequestChoiceInput.javaindex 0d8f6e3473..51888296f8 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/PullRequestChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/PullRequestChoiceInput.java@@ -40,7 +40,7 @@ public class PullRequestChoiceInput {public static List<String> convertToStrings(Object value) {if (value instanceof Long)- return Lists.newArrayList((String) value);+ return Lists.newArrayList(value.toString());elsereturn new ArrayList<>();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex 02c864b1c8..97df843093 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -48,7 +48,7 @@ public class BoardSpec implements Serializable {private String baseQuery;- private String backlogBaseQuery = "outstanding";+ private String backlogBaseQuery = "\"State\" is \"Open\"";private String identifyField;diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.javaindex 13ed1fb58a..f824d44f1b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java+++ b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java@@ -46,7 +46,7 @@ public class JobPrivilege implements Serializable {@SuppressWarnings("unused")private static List<InputSuggestion> suggestJobNames(String matchWith) {- List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class).getJobNames(null));+ List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class).getJobNames());Collections.sort(jobNames);return SuggestionUtils.suggest(jobNames, matchWith);}@@ -66,7 +66,7 @@ public class JobPrivilege implements Serializable {}@Editable(order=200, description="The permission to run job manually. It also implies the permission "- + "to access build log, published artifacts and reports")+ + "to access build log, and all published reports")@ShowCondition("isManageJobDisabled")public boolean isRunJob() {return runJob;@@ -81,8 +81,8 @@ public class JobPrivilege implements Serializable {return !(boolean) EditContext.get().getInputValue("runJob");}- @Editable(order=300, name="Access Build Log", description="The permission to access build log. It also implies the permission "- + "to access published artifacts and reports")+ @Editable(order=300, name="Access Build Log", description="The permission to access build log. "+ + "It also implies the permission to access published reports")@ShowCondition("isRunJobDisabled")public boolean isAccessLog() {return accessLog;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 e6079655c4..ea79493e16 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,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.AbstractEntity;-import io.onedev.server.model.Project;import io.onedev.server.model.User;public class AndCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {@@ -22,10 +21,10 @@ public class AndCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<}@Override- public Predicate getPredicate(Project project, Root<T> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<T> root, CriteriaBuilder builder, User user) {List<Predicate> predicates = new ArrayList<>();for (EntityCriteria<T> criteria: criterias)- predicates.add(criteria.getPredicate(project, root, builder, user));+ predicates.add(criteria.getPredicate(root, builder, user));return builder.and(predicates.toArray(new Predicate[0]));}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 1f2c3e970e..0fd76ca33f 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@@ -13,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.Project;import io.onedev.server.model.User;public abstract class EntityCriteria<T extends AbstractEntity> implements Serializable {@@ -22,7 +21,7 @@ public abstract class EntityCriteria<T extends AbstractEntity> implements Serialpublic static final int IN_CLAUSE_LIMIT = 1000;- public abstract Predicate getPredicate(Project project, Root<T> root, CriteriaBuilder builder, User user);+ public abstract Predicate getPredicate(Root<T> root, CriteriaBuilder builder, User user);public abstract boolean matches(T entity, User user);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 ce3d4d2ffa..33d4328aa8 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@@ -1,15 +1,12 @@package io.onedev.server.search.entity;-import java.io.IOException;import java.io.Serializable;import java.util.Date;import java.util.List;+import javax.annotation.Nullable;import javax.persistence.criteria.Path;-import org.eclipse.jgit.errors.RevisionSyntaxException;-import org.eclipse.jgit.lib.ObjectId;-import com.google.common.base.Splitter;import io.onedev.commons.codeassist.FenceAware;@@ -18,15 +15,19 @@ import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;+import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.util.DateUtils;+import io.onedev.server.util.ProjectAwareCommitId;+import io.onedev.server.util.ProjectAwareRevision;public abstract class EntityQuery<T extends AbstractEntity> implements Serializable {@@ -79,45 +80,76 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializareturn dateValue;}- public static ObjectId getCommitId(Project project, String revision) {- try {- ObjectId commitId = project.getRepository().resolve(revision);- if (commitId == null)- throw new RevisionSyntaxException("");- return commitId;- } catch (RevisionSyntaxException | IOException e) {- throw new OneException("Invalid revision string: " + revision);- }+ public static ProjectAwareCommitId getCommitId(@Nullable Project project, String value) {+ if (project != null && !value.contains(":"))+ value = project.getName() + ":" + value;+ ProjectAwareCommitId commitId = ProjectAwareCommitId.from(value);+ if (commitId != null)+ return commitId;+ else+ throw new OneException("Unable to find revision: " + value);}- public static Issue getIssue(Project project, String number) {- if (number.startsWith("#"))- number = number.substring(1);- Issue issue = OneDev.getInstance(IssueManager.class).find(project, getLongValue(number));+ public static ProjectAwareRevision getRevision(@Nullable Project project, String value) {+ if (project != null && !value.contains(":"))+ value = project.getName() + ":" + value;+ ProjectAwareRevision revision = ProjectAwareRevision.from(value);+ if (revision != null)+ return revision;+ else+ throw new OneException("Unable to find revision: " + value);+ }++ public static Issue getIssue(@Nullable Project project, String value) {+ if (project != null) {+ if (value.startsWith("#"))+ value = project.getName() + value;+ else if (!value.contains("#"))+ value = project.getName() + "#" + value;+ }+ Issue issue = OneDev.getInstance(IssueManager.class).find(value);if (issue != null)return issue;else- throw new OneException("Unable to find issue: #" + number);+ throw new OneException("Unable to find issue: " + value);}- public static PullRequest getPullRequest(Project project, String number) {- if (number.startsWith("#"))- number = number.substring(1);- PullRequest request = OneDev.getInstance(PullRequestManager.class).find(project, getLongValue(number));- if (request != null)- return request;+ public static PullRequest getPullRequest(@Nullable Project project, String value) {+ if (project != null) {+ if (value.startsWith("#"))+ value = project.getName() + value;+ else if (!value.contains("#"))+ value = project.getName() + "#" + value;+ }+ PullRequest pullRequest = OneDev.getInstance(PullRequestManager.class).find(value);+ if (pullRequest != null)+ return pullRequest;else- throw new OneException("Unable to find pull request: #" + number);+ throw new OneException("Unable to find pull request: " + value);}- public static Build getBuild(Project project, String number) {- if (number.startsWith("#"))- number = number.substring(1);- Build build = OneDev.getInstance(BuildManager.class).find(project, getLongValue(number));+ public static Build getBuild(@Nullable Project project, String value) {+ if (project != null) {+ if (value.startsWith("#"))+ value = project.getName() + value;+ else if (!value.contains("#"))+ value = project.getName() + "#" + value;+ }+ Build build = OneDev.getInstance(BuildManager.class).find(value);if (build != null)return build;else- throw new OneException("Unable to find build: #" + number);+ throw new OneException("Unable to find build: " + value);+ }++ public static Milestone getMilestone(@Nullable Project project, String value) {+ if (project != null && !value.contains(":"))+ value = project.getName() + ":" + value;+ Milestone milestone = OneDev.getInstance(MilestoneManager.class).find(value);+ if (milestone != null)+ return milestone;+ else+ throw new OneException("Unable to find milestone: " + value);}public boolean needsLogin() {diff --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 6f7c027131..389bc12414 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.Project;import io.onedev.server.model.User;public class NotCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {@@ -19,8 +18,8 @@ public class NotCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<}@Override- public Predicate getPredicate(Project project, Root<T> root, CriteriaBuilder builder, User user) {- return criteria.getPredicate(project, root, builder, user).not();+ public Predicate getPredicate(Root<T> root, CriteriaBuilder builder, User user) {+ return criteria.getPredicate(root, builder, user).not();}@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 0473c1b193..05914472fc 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,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.AbstractEntity;-import io.onedev.server.model.Project;import io.onedev.server.model.User;public class OrCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {@@ -22,10 +21,10 @@ public class OrCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T}@Override- public Predicate getPredicate(Project project, Root<T> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<T> root, CriteriaBuilder builder, User user) {List<Predicate> predicates = new ArrayList<>();for (EntityCriteria<T> criteria: criterias)- predicates.add(criteria.getPredicate(project, root, builder, user));+ predicates.add(criteria.getPredicate(root, builder, user));return builder.or(predicates.toArray(new Predicate[0]));}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 f5ee0fb87a..253d182474 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@@ -1,5 +1,6 @@package io.onedev.server.search.entity.build;+import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.From;import javax.persistence.criteria.JoinType;@@ -12,27 +13,34 @@ 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.BuildConstants;public class AssociatedWithPullRequestCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;- private PullRequest value;+ private final PullRequest request;- public AssociatedWithPullRequestCriteria(PullRequest value) {+ private final String value;++ public AssociatedWithPullRequestCriteria(@Nullable Project project, String value) {+ request = EntityQuery.getPullRequest(project, value);this.value = value;}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(BuildConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);- return builder.equal(join.get(PullRequestBuild.ATTR_REQUEST), value);+ return builder.and(+ builder.equal(root.get(BuildConstants.ATTR_PROJECT), request.getTargetProject()),+ builder.equal(join.get(PullRequestBuild.ATTR_REQUEST), request));}@Overridepublic boolean matches(Build build, User user) {- return build.getPullRequestBuilds().stream().anyMatch(it -> it.getRequest().equals(value));+ return build.getProject().equals(request.getTargetProject())+ && build.getPullRequestBuilds().stream().anyMatch(it -> it.getRequest().equals(request));}@Override@@ -42,7 +50,7 @@ public class AssociatedWithPullRequestCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.AssociatedWithPullRequest) + " " + BuildQuery.quote("#" + value.getNumber());+ 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 53318cb6f4..812bd3ff01 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,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -15,7 +14,7 @@ public class AssociatedWithPullRequestsCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {return builder.isNotEmpty(root.get(BuildConstants.ATTR_PULL_REQUEST_BUILDS));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex 124c64e34c..18ae2fc97a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -11,7 +11,6 @@ import static io.onedev.server.util.BuildConstants.FIELD_VERSION;import java.util.ArrayList;import java.util.Collection;-import java.util.Date;import java.util.List;import javax.annotation.Nullable;@@ -48,6 +47,7 @@ import io.onedev.server.search.entity.build.BuildQueryParser.OrderContext;import io.onedev.server.search.entity.build.BuildQueryParser.ParensCriteriaContext;import io.onedev.server.search.entity.build.BuildQueryParser.QueryContext;import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.ProjectAwareCommitId;public class BuildQuery extends EntityQuery<Build> {@@ -133,38 +133,22 @@ public class BuildQuery extends EntityQuery<Build> {@Overridepublic EntityCriteria<Build> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {String value = getValue(ctx.Quoted().getText());- if (ctx.SubmittedBy() != null) {+ if (ctx.SubmittedBy() != null)return new SubmittedByCriteria(getUser(value), value);- } else if (ctx.CancelledBy() != null) {+ else if (ctx.CancelledBy() != null)return new CancelledByCriteria(getUser(value), value);- } else if (ctx.FixedIssue() != null) {- if (project != null)- return new FixedIssueCriteria(getIssue(project, value));- else- throw new OneException("Unsupported criteria in global build query: " + getRuleName(BuildQueryLexer.FixedIssue));- } else if (ctx.DependsOn() != null) {- if (project != null)- return new DependsOnCriteria(getBuild(project, value));- else- throw new OneException("Unsupported criteria in global build query: " + getRuleName(BuildQueryLexer.DependsOn));- } else if (ctx.DependenciesOf() != null) {- if (project != null)- return new DependenciesOfCriteria(getBuild(project, value));- else- throw new OneException("Unsupported criteria in global build query: " + getRuleName(BuildQueryLexer.DependenciesOf));- } else if (ctx.RequiredByPullRequest() != null) {- if (project != null)- return new RequiredByPullRequestCriteria(getPullRequest(project, value));- else- throw new OneException("Unsupported criteria in global build query: " + getRuleName(BuildQueryLexer.RequiredByPullRequest));- } else if (ctx.AssociatedWithPullRequest() != null) {- if (project != null)- return new AssociatedWithPullRequestCriteria(getPullRequest(project, value));- else- throw new OneException("Unsupported criteria in global build query: " + getRuleName(BuildQueryLexer.AssociatedWithPullRequest));- } else {+ else if (ctx.FixedIssue() != null)+ return new FixedIssueCriteria(project, value);+ else if (ctx.DependsOn() != null)+ return new DependsOnCriteria(project, value);+ else if (ctx.DependenciesOf() != null)+ return new DependenciesOfCriteria(project, value);+ else if (ctx.RequiredByPullRequest() != null)+ return new RequiredByPullRequestCriteria(project, value);+ else if (ctx.AssociatedWithPullRequest() != null)+ return new AssociatedWithPullRequestCriteria(project, value);+ elsethrow new RuntimeException("Unexpected criteria: " + ctx.operator.getText());- }}@Override@@ -182,24 +166,21 @@ public class BuildQuery extends EntityQuery<Build> {switch (operator) {case BuildQueryLexer.IsBefore:case BuildQueryLexer.IsAfter:- Date dateValue = getDateValue(value);if (fieldName.equals(FIELD_SUBMIT_DATE))- return new SubmitDateCriteria(dateValue, value, operator);+ return new SubmitDateCriteria(value, operator);else if (fieldName.equals(FIELD_QUEUEING_DATE))- return new QueueingDateCriteria(dateValue, value, operator);+ return new QueueingDateCriteria(value, operator);else if (fieldName.equals(FIELD_RUNNING_DATE))- return new RunningDateCriteria(dateValue, value, operator);+ return new RunningDateCriteria(value, operator);else if (fieldName.equals(FIELD_FINISH_DATE))- return new FinishDateCriteria(dateValue, value, operator);+ return new FinishDateCriteria(value, operator);elsethrow new IllegalStateException();case BuildQueryLexer.Is:switch (fieldName) {case FIELD_COMMIT:- if (project != null)- return new CommitCriteria(getCommitId(project, value));- else- throw new OneException("Unable to query by commit in global build query");+ ProjectAwareCommitId commitId = getCommitId(project, value);+ return new CommitCriteria(commitId.getProject(), commitId.getCommitId());case FIELD_JOB:return new JobCriteria(value);case FIELD_NUMBER: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 6ab033d4c5..79d78ff183 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@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -27,7 +26,7 @@ public class CancelledByCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(BuildConstants.ATTR_CANCELLER);return builder.equal(attribute, 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 f0f1088c95..39c6bf96ec 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@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -18,7 +17,7 @@ public class CancelledByMeCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(BuildConstants.ATTR_CANCELLER);return builder.equal(attribute, user);}diff --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 1fdc6d90fb..8b85a0512b 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,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -16,7 +15,7 @@ public class CancelledCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.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 abf0a88336..677f72b1a7 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@@ -17,21 +17,27 @@ public class CommitCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;- private final ObjectId value;+ private final Project project;- public CommitCriteria(ObjectId value) {- this.value = value;+ private final ObjectId commitId;++ public CommitCriteria(Project project, ObjectId commitId) {+ this.project = project;+ this.commitId = commitId;}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {- Path<?> attribute = BuildQuery.getPath(root, BuildConstants.ATTR_COMMIT);- return builder.equal(attribute, value.name());+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ Path<?> projectAttribute = BuildQuery.getPath(root, BuildConstants.ATTR_PROJECT);+ Path<?> commitAttribute = BuildQuery.getPath(root, BuildConstants.ATTR_COMMIT);+ return builder.and(+ builder.equal(projectAttribute, project),+ builder.equal(commitAttribute, commitId.name()));}@Overridepublic boolean matches(Build build, User user) {- return build.getCommitHash().equals(value.name());+ return build.getProject().equals(project) && build.getCommitHash().equals(commitId.name());}@Override@@ -41,7 +47,7 @@ public class CommitCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_COMMIT) + " " + BuildQuery.getRuleName(BuildQueryLexer.Is) + " " + BuildQuery.quote(value.name());+ return BuildQuery.quote(BuildConstants.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 96841b319c..e18eabf283 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@@ -1,5 +1,6 @@package io.onedev.server.search.entity.build;+import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.From;import javax.persistence.criteria.JoinType;@@ -11,27 +12,31 @@ 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.BuildConstants;public class DependenciesOfCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;- private Build value;+ private final Build build;- public DependenciesOfCriteria(Build value) {+ private final String value;++ public DependenciesOfCriteria(@Nullable Project project, String value) {+ build = EntityQuery.getBuild(project, value);this.value = value;}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(BuildConstants.ATTR_DEPENDENTS, JoinType.LEFT);- return builder.equal(join.get(BuildDependence.ATTR_DEPENDENT), value);+ return builder.equal(join.get(BuildDependence.ATTR_DEPENDENT), build);}@Overridepublic boolean matches(Build build, User user) {- for (BuildDependence dependence: value.getDependencies()) {+ for (BuildDependence dependence: this.build.getDependencies()) {if (dependence.getDependency().equals(build))return true;}@@ -45,7 +50,7 @@ public class DependenciesOfCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.DependenciesOf) + " " + BuildQuery.quote("#" + value.getNumber());+ 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 0f3b9d542b..dd245c5035 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@@ -1,5 +1,6 @@package io.onedev.server.search.entity.build;+import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.From;import javax.persistence.criteria.JoinType;@@ -11,27 +12,31 @@ 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.BuildConstants;public class DependsOnCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;- private Build value;+ private final Build build;- public DependsOnCriteria(Build value) {+ private final String value;++ public DependsOnCriteria(@Nullable Project project, String value) {+ build = EntityQuery.getBuild(project, value);this.value = value;}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(BuildConstants.ATTR_DEPENDENCIES, JoinType.LEFT);- return builder.equal(join.get(BuildDependence.ATTR_DEPENDENCY), value);+ return builder.equal(join.get(BuildDependence.ATTR_DEPENDENCY), build);}@Overridepublic boolean matches(Build build, User user) {- for (BuildDependence dependence: value.getDependents()) {+ for (BuildDependence dependence: this.build.getDependents()) {if (dependence.getDependent().equals(build))return true;}@@ -45,7 +50,7 @@ public class DependsOnCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.DependsOn) + " " + BuildQuery.quote("#" + value.getNumber());+ 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 485f19f98d..da193505b8 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,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -16,7 +15,7 @@ public class FailedCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.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 02a069db83..2192be7e04 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,9 +8,9 @@ import javax.persistence.criteria.Predicate;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.BuildConstants;public class FinishDateCriteria extends EntityCriteria<Build> {@@ -19,31 +19,31 @@ public class FinishDateCriteria extends EntityCriteria<Build> {private final int operator;- private final Date value;+ private final Date date;- private final String rawValue;+ private final String value;- public FinishDateCriteria(Date value, String rawValue, int operator) {+ public FinishDateCriteria(String value, int operator) {+ date = EntityQuery.getDateValue(value);this.operator = operator;this.value = value;- this.rawValue = rawValue;}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<Date> attribute = root.get(BuildConstants.ATTR_FINISH_DATE);if (operator == BuildQueryLexer.IsBefore)- return builder.lessThan(attribute, value);+ return builder.lessThan(attribute, date);else- return builder.greaterThan(attribute, value);+ return builder.greaterThan(attribute, date);}@Overridepublic boolean matches(Build build, User user) {if (operator == BuildQueryLexer.IsBefore)- return build.getFinishDate().before(value);+ return build.getFinishDate().before(date);else- return build.getFinishDate().after(value);+ return build.getFinishDate().after(date);}@Override@@ -53,7 +53,8 @@ public class FinishDateCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_FINISH_DATE) + " " + BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(rawValue);+ return BuildQuery.quote(BuildConstants.FIELD_FINISH_DATE) + " "+ + BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(value);}}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 a409bd7313..779e982c67 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.build;import java.util.Collection;import java.util.HashSet;+import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -19,41 +20,55 @@ 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.BuildConstants;public class FixedIssueCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;- private Issue value;+ private final Issue issue;- public FixedIssueCriteria(Issue value) {+ private final String value;++ public FixedIssueCriteria(@Nullable Project project, String value) {+ issue = EntityQuery.getIssue(project, value);this.value = value;}++ public FixedIssueCriteria(Issue issue) {+ this.issue = issue;+ value = String.valueOf(issue.getNumber());+ }private CommitInfoManager getCommitInfoManager() {return OneDev.getInstance(CommitInfoManager.class);}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<Long> attribute = root.get(BuildConstants.ATTR_ID);- Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(project, value.getNumber());+ Project project = issue.getProject();+ Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(project, issue.getNumber());Collection<String> descendents = new HashSet<>();for (ObjectId each: getCommitInfoManager().getDescendants(project, fixCommits))descendents.add(each.name());BuildManager buildManager = OneDev.getInstance(BuildManager.class);Collection<Long> inBuildIds = buildManager.filterBuildIds(project.getId(), descendents);- return inManyValues(builder, attribute, inBuildIds, buildManager.getBuildIdsByProject(project.getId()));+ return builder.and(+ builder.equal(root.get(BuildConstants.ATTR_PROJECT), issue.getProject()),+ inManyValues(builder, attribute, inBuildIds, buildManager.getBuildIdsByProject(project.getId())));}@Overridepublic boolean matches(Build build, User user) {- Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(build.getProject(), value.getNumber());- for (ObjectId commit: fixCommits) {- ObjectId buildCommit = ObjectId.fromString(build.getCommitHash());- if (GitUtils.isMergedInto(build.getProject().getRepository(), null, commit, buildCommit))- return true;+ if (build.getProject().equals(issue.getProject())) {+ Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(build.getProject(), issue.getNumber());+ for (ObjectId commit: fixCommits) {+ ObjectId buildCommit = ObjectId.fromString(build.getCommitHash());+ if (GitUtils.isMergedInto(build.getProject().getRepository(), null, commit, buildCommit))+ return true;+ }}return false;}@@ -65,7 +80,7 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.FixedIssue) + " " + BuildQuery.quote("#" + value.getNumber());+ 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 8a6547b769..b83828b40e 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@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -15,21 +14,21 @@ public class JobCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;- private String value;+ private String jobName;- public JobCriteria(String value) {- this.value = value;+ public JobCriteria(String jobName) {+ this.jobName = jobName;}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<?> attribute = root.get(BuildConstants.ATTR_JOB);- return builder.equal(attribute, value);+ return builder.equal(attribute, jobName);}@Overridepublic boolean matches(Build build, User user) {- return build.getJobName().equals(value);+ return build.getJobName().equals(jobName);}@Override@@ -39,7 +38,9 @@ public class JobCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_JOB) + " " + BuildQuery.getRuleName(BuildQueryLexer.Is) + " " + BuildQuery.quote(value);+ return BuildQuery.quote(BuildConstants.FIELD_JOB) + " "+ + BuildQuery.getRuleName(BuildQueryLexer.Is) + " "+ + BuildQuery.quote(jobName);}}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 d210028d49..973bcb9f4e 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@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -26,7 +25,7 @@ public class NumberCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<Long> attribute = root.get(IssueConstants.ATTR_NUMBER);if (operator == BuildQueryLexer.Is)return builder.equal(attribute, value);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 e0ded73d92..881d927be2 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,6 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.BuildParam;-import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.BuildConstants;@@ -29,7 +28,7 @@ public class ParamCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(BuildConstants.ATTR_PARAMS, JoinType.LEFT);return builder.and(builder.equal(join.get(BuildParam.ATTR_NAME), name),@@ -52,7 +51,9 @@ public class ParamCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(name) + " " + BuildQuery.getRuleName(BuildQueryLexer.Is) + " " + BuildQuery.quote(value);+ return BuildQuery.quote(name) + " "+ + BuildQuery.getRuleName(BuildQueryLexer.Is)+ + " " + BuildQuery.quote(value);}}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 09077212ef..94a3bc2e0e 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,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -16,7 +15,7 @@ public class PendingCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.PENDING);}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 07da6338aa..14a62a777f 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,9 +8,9 @@ import javax.persistence.criteria.Predicate;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.BuildConstants;public class QueueingDateCriteria extends EntityCriteria<Build> {@@ -19,31 +19,31 @@ public class QueueingDateCriteria extends EntityCriteria<Build> {private final int operator;- private final Date value;+ private final Date date;- private final String rawValue;+ private final String value;- public QueueingDateCriteria(Date value, String rawValue, int operator) {+ public QueueingDateCriteria(String value, int operator) {+ date = EntityQuery.getDateValue(value);this.operator = operator;this.value = value;- this.rawValue = rawValue;}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<Date> attribute = root.get(BuildConstants.ATTR_QUEUEING_DATE);if (operator == BuildQueryLexer.IsBefore)- return builder.lessThan(attribute, value);+ return builder.lessThan(attribute, date);else- return builder.greaterThan(attribute, value);+ return builder.greaterThan(attribute, date);}@Overridepublic boolean matches(Build build, User user) {if (operator == BuildQueryLexer.IsBefore)- return build.getPendingDate().before(value);+ return build.getPendingDate().before(date);else- return build.getPendingDate().after(value);+ return build.getPendingDate().after(date);}@Override@@ -53,7 +53,8 @@ public class QueueingDateCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_QUEUEING_DATE) + " " + BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(rawValue);+ return BuildQuery.quote(BuildConstants.FIELD_QUEUEING_DATE) + " "+ + BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(value);}}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 39f095b6c9..3ab62ca90e 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@@ -1,5 +1,6 @@package io.onedev.server.search.entity.build;+import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.From;import javax.persistence.criteria.JoinType;@@ -12,30 +13,36 @@ 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.BuildConstants;public class RequiredByPullRequestCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;- private PullRequest value;+ private final PullRequest request;- public RequiredByPullRequestCriteria(PullRequest value) {+ private final String value;++ public RequiredByPullRequestCriteria(@Nullable Project project, String value) {+ request = EntityQuery.getPullRequest(project, value);this.value = value;}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(BuildConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);return builder.and(- builder.equal(join.get(PullRequestBuild.ATTR_REQUEST), value),+ builder.equal(root.get(BuildConstants.ATTR_PROJECT), request.getTargetProject()),+ builder.equal(join.get(PullRequestBuild.ATTR_REQUEST), request),builder.equal(join.get(PullRequestBuild.ATTR_REQUIRED), true));}@Overridepublic boolean matches(Build build, User user) {- return build.getPullRequestBuilds().stream().anyMatch(it -> it.getRequest().equals(value) && it.isRequired());+ return build.getProject().equals(request.getTargetProject())+ && build.getPullRequestBuilds().stream().anyMatch(it -> it.getRequest().equals(request) && it.isRequired());}@Override@@ -45,7 +52,7 @@ public class RequiredByPullRequestCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.RequiredByPullRequest) + " " + BuildQuery.quote("#" + value.getNumber());+ 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 47d3b9685a..7c164b66bc 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@@ -7,7 +7,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequestBuild;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;@@ -18,7 +17,7 @@ public class RequiredByPullRequestsCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(BuildConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);return builder.equal(join.get(PullRequestBuild.ATTR_REQUIRED), true);}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 8e749e5518..a912d44642 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,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -16,7 +15,7 @@ public class RunningCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.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 9776f7e5d1..b7683ec2b8 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,9 +8,9 @@ import javax.persistence.criteria.Predicate;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.BuildConstants;public class RunningDateCriteria extends EntityCriteria<Build> {@@ -19,31 +19,31 @@ public class RunningDateCriteria extends EntityCriteria<Build> {private final int operator;- private final Date value;+ private final Date date;- private final String rawValue;+ private final String value;- public RunningDateCriteria(Date value, String rawValue, int operator) {+ public RunningDateCriteria(String value, int operator) {this.operator = operator;+ date = EntityQuery.getDateValue(value);this.value = value;- this.rawValue = rawValue;}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<Date> attribute = root.get(BuildConstants.ATTR_RUNNING_DATE);if (operator == BuildQueryLexer.IsBefore)- return builder.lessThan(attribute, value);+ return builder.lessThan(attribute, date);else- return builder.greaterThan(attribute, value);+ return builder.greaterThan(attribute, date);}@Overridepublic boolean matches(Build build, User user) {if (operator == BuildQueryLexer.IsBefore)- return build.getRunningDate().before(value);+ return build.getRunningDate().before(date);else- return build.getRunningDate().after(value);+ return build.getRunningDate().after(date);}@Override@@ -53,7 +53,8 @@ public class RunningDateCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_RUNNING_DATE) + " " + BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(rawValue);+ return BuildQuery.quote(BuildConstants.FIELD_RUNNING_DATE) + " "+ + BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(value);}}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 72d54d9f79..3b311a54a6 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,9 +8,9 @@ import javax.persistence.criteria.Predicate;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.BuildConstants;public class SubmitDateCriteria extends EntityCriteria<Build> {@@ -19,31 +19,31 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {private final int operator;- private final Date value;+ private final Date date;- private final String rawValue;+ private final String value;- public SubmitDateCriteria(Date value, String rawValue, int operator) {+ public SubmitDateCriteria(String value, int operator) {+ date = EntityQuery.getDateValue(value);this.operator = operator;this.value = value;- this.rawValue = rawValue;}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<Date> attribute = root.get(BuildConstants.ATTR_SUBMIT_DATE);if (operator == BuildQueryLexer.IsBefore)- return builder.lessThan(attribute, value);+ return builder.lessThan(attribute, date);else- return builder.greaterThan(attribute, value);+ return builder.greaterThan(attribute, date);}@Overridepublic boolean matches(Build build, User user) {if (operator == BuildQueryLexer.IsBefore)- return build.getSubmitDate().before(value);+ return build.getSubmitDate().before(date);else- return build.getSubmitDate().after(value);+ return build.getSubmitDate().after(date);}@Override@@ -53,7 +53,8 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_SUBMIT_DATE) + " " + BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(rawValue);+ return BuildQuery.quote(BuildConstants.FIELD_SUBMIT_DATE) + " "+ + BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(value);}}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 76ab545c72..0db80b0257 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@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -27,7 +26,7 @@ public class SubmittedByCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(BuildConstants.ATTR_SUBMITTER);return builder.equal(attribute, 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 43d18dcfae..79d2189f37 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@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -18,7 +17,7 @@ public class SubmittedByMeCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(BuildConstants.ATTR_SUBMITTER);return builder.equal(attribute, user);}diff --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 10a195ab71..a8ada31544 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,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -16,7 +15,7 @@ public class SuccessfulCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.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 f094e9b659..fe72fcf939 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,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -16,7 +15,7 @@ public class TimedOutCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.TIMED_OUT);}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 cb01abf799..49db4ca436 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@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -22,7 +21,7 @@ public class VersionCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<String> attribute = root.get(BuildConstants.ATTR_VERSION);String normalized = value.toLowerCase().replace("*", "%");return builder.like(builder.lower(attribute), normalized);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 62962095a0..54b9fa3244 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,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -16,7 +15,7 @@ public class WaitingCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.WAITING);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/WillRetryCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/WillRetryCriteria.javaindex eeccc45a2a..b1d759b116 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/WillRetryCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/WillRetryCriteria.java@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;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.util.BuildConstants;@@ -16,7 +15,7 @@ public class WillRetryCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<?> attribute = root.get(BuildConstants.ATTR_WILL_RETRY);return builder.equal(attribute, true);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.javaindex 8de01d3ce9..f7625ddd1c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java@@ -43,6 +43,7 @@ import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OrderCoimport io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.ParensCriteriaContext;import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.QueryContext;import io.onedev.server.util.CodeCommentConstants;+import io.onedev.server.util.ProjectAwareCommitId;public class CodeCommentQuery extends EntityQuery<CodeComment> {@@ -102,10 +103,12 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {public EntityCriteria<CodeComment> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {int operator = ctx.operator.getType();String value = getValue(ctx.Quoted().getText());- if (operator == CodeCommentQueryLexer.CreatedBy)+ if (operator == CodeCommentQueryLexer.CreatedBy) {return new CreatedByCriteria(getUser(value));- else- return new OnCommitCriteria(getCommitId(project, value));+ } else {+ ProjectAwareCommitId commitId = getCommitId(project, value);+ return new OnCommitCriteria(commitId.getProject(), commitId.getCommitId());+ }}@Overridediff --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 7b3d9662e2..cc36c7f2de 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@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;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.CodeCommentConstants;@@ -22,7 +21,7 @@ public class ContentCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {Path<String> attribute = root.get(CodeCommentConstants.ATTR_CONTENT);return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");}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 23f1d1f3d1..8f0aa6bb5d 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,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;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.CodeCommentConstants;@@ -30,7 +29,7 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {Path<Date> attribute = root.get(CodeCommentConstants.ATTR_CREATE_DATE);if (operator == CodeCommentQueryLexer.IsBefore)return builder.lessThan(attribute, value);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 7424f97aba..aecd4ebd28 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@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;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.CodeCommentConstants;@@ -24,7 +23,7 @@ public class CreatedByCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(CodeCommentConstants.ATTR_USER);return builder.equal(attribute, value);}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 daeff0e324..bd414ad2ad 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@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;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.CodeCommentConstants;@@ -18,7 +17,7 @@ public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {Path<?> attribute = root.get(CodeCommentConstants.ATTR_USER);return builder.equal(attribute, user);}diff --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 4aa6f4c3b2..e558a2c036 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@@ -17,21 +17,28 @@ public class OnCommitCriteria extends EntityCriteria<CodeComment> {private static final long serialVersionUID = 1L;- private final ObjectId value;+ private final Project project;- public OnCommitCriteria(ObjectId value) {- this.value = value;+ private final ObjectId commitId;++ public OnCommitCriteria(Project project, ObjectId commitId) {+ this.project = project;+ this.commitId = commitId;}@Override- public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {- Path<?> attribute = CodeCommentQuery.getPath(root, CodeCommentConstants.ATTR_COMMIT);- return builder.equal(attribute, value.name());+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {+ Path<?> projectAttribute = CodeCommentQuery.getPath(root, CodeCommentConstants.ATTR_PROJECT);+ Path<?> commitAttribute = CodeCommentQuery.getPath(root, CodeCommentConstants.ATTR_COMMIT);+ return builder.and(+ builder.equal(projectAttribute, project),+ builder.equal(commitAttribute, commitId.name()));}@Overridepublic boolean matches(CodeComment comment, User user) {- return comment.getMarkPos().getCommit().equals(value.name());+ return comment.getProject().equals(project)+ && comment.getMarkPos().getCommit().equals(commitId.name());}@Override@@ -41,7 +48,7 @@ public class OnCommitCriteria extends EntityCriteria<CodeComment> {@Overridepublic String toString() {- return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.OnCommit) + " " + CodeCommentQuery.quote(value.name());+ 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 d6567775b7..48142bea10 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,6 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;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.CodeCommentConstants;@@ -23,7 +22,7 @@ public class PathCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {Path<String> attribute = CodeCommentQuery.getPath(root, CodeCommentConstants.ATTR_PATH);String normalized = value.toLowerCase().replace('*', '%');if (normalized.endsWith("/"))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 2c3bbbae52..0473ebb8a2 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,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;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.CodeCommentConstants;@@ -25,7 +24,7 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {Path<Integer> attribute = root.get(CodeCommentConstants.ATTR_REPLY_COUNT);if (operator == CodeCommentQueryLexer.Is)return builder.equal(attribute, 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 fcf86db67b..b7c87dcead 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@@ -9,7 +9,6 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;-import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.CodeCommentConstants;@@ -25,7 +24,7 @@ public class ReplyCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(CodeCommentConstants.ATTR_REPLIES, JoinType.LEFT);Path<String> attribute = join.get(CodeCommentReply.ATTR_CONTENT);return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");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 fb6518d6d8..ea4d8db3ea 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,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;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.CodeCommentConstants;@@ -30,7 +29,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {Path<Date> attribute = CodeCommentQuery.getPath(root, CodeCommentConstants.ATTR_UPDATE_DATE);if (operator == CodeCommentQueryLexer.IsBefore)return builder.lessThan(attribute, value);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 8158efbcda..441882d43b 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.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.AndCriteriaHelper;import io.onedev.server.search.entity.ParensAware;@@ -30,8 +29,8 @@ public class AndCriteria extends IssueCriteria implements ParensAware {}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {- return new AndCriteriaHelper<Issue>(criterias).getPredicate(project, root, builder, user);+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ return new AndCriteriaHelper<Issue>(criterias).getPredicate(root, builder, user);}@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 184ce2e5a8..9d671aacf5 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,6 @@ 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;public class BooleanFieldCriteria extends FieldCriteria {@@ -24,7 +23,7 @@ public class BooleanFieldCriteria extends FieldCriteria {}@Override- public Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {+ public Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {return builder.equal(field.get(IssueField.ATTR_VALUE), 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.javanew file mode 100644index 0000000000..2ea4054ca1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java@@ -0,0 +1,57 @@+package io.onedev.server.search.entity.issue;++import java.util.Objects;++import javax.annotation.Nullable;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Join;+import javax.persistence.criteria.Predicate;++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.IssueConstants;++public class BuildFieldCriteria extends FieldCriteria {++ private static final long serialVersionUID = 1L;++ private final Build build;++ private final String value;++ public BuildFieldCriteria(String name, @Nullable Project project, String value) {+ super(name);+ build = EntityQuery.getBuild(project, value);+ this.value = value;+ }++ @Override+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {+ return builder.and(+ builder.equal(field.getParent().get(IssueConstants.ATTR_PROJECT), build.getProject()),+ builder.equal(field.get(IssueField.ATTR_ORDINAL), build.getNumber()));+ }++ @Override+ public boolean matches(Issue issue, User user) {+ Object fieldValue = issue.getFieldValue(getFieldName());+ return issue.getProject().equals(build.getProject()) && Objects.equals(fieldValue, build.getNumber());+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return IssueQuery.quote(getFieldName()) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ + IssueQuery.quote(value);+ }++}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 e871e000f6..7490e23fd5 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,7 +15,6 @@ 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.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;@@ -43,7 +42,7 @@ public class ChoiceFieldCriteria extends FieldCriteria {}@Override- protected Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {if (allowMultiple) {return builder.equal(field.get(IssueField.ATTR_VALUE), String.valueOf(value));} else {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 56b0719a36..091bdc2872 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,6 @@ import javax.persistence.criteria.Predicate;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.util.IssueConstants;@@ -24,7 +23,7 @@ public class CommentCountCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Path<Integer> attribute = root.get(IssueConstants.ATTR_COMMENT_COUNT);if (operator == IssueQueryLexer.Is)return builder.equal(attribute, value);@@ -51,7 +50,8 @@ public class CommentCountCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_COMMENT_COUNT) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(IssueConstants.FIELD_COMMENT_COUNT) + " "+ + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}}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 67f52be51a..7e9f241744 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,6 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;-import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.util.IssueConstants;@@ -24,7 +23,7 @@ public class CommentCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(IssueConstants.ATTR_COMMENTS, JoinType.LEFT);Path<String> attribute = join.get(IssueComment.PATH_CONTENT);return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");@@ -46,7 +45,8 @@ public class CommentCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_COMMENT) + " " + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(IssueConstants.FIELD_COMMENT) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " " + IssueQuery.quote(value);}}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 f844a25b36..f2bbd989c5 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,41 +8,41 @@ 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;public class DateFieldCriteria extends FieldCriteria {private static final long serialVersionUID = 1L;- private final Date value;+ private final Date date;- private final String rawValue;+ private final String value;private final int operator;- public DateFieldCriteria(String name, Date value, String rawValue, int operator) {+ public DateFieldCriteria(String name, String value, int operator) {super(name);+ date = EntityQuery.getDateValue(value);this.value = value;- this.rawValue = rawValue;this.operator = operator;}@Override- protected Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {if (operator == IssueQueryLexer.IsBefore)- return builder.lessThan(field.get(IssueField.ATTR_ORDINAL), value.getTime());+ return builder.lessThan(field.get(IssueField.ATTR_ORDINAL), date.getTime());else- return builder.greaterThan(field.get(IssueField.ATTR_ORDINAL), value.getTime());+ return builder.greaterThan(field.get(IssueField.ATTR_ORDINAL), date.getTime());}@Overridepublic boolean matches(Issue issue, User user) {Date fieldValue = (Date) issue.getFieldValue(getFieldName());if (operator == IssueQueryLexer.IsBefore)- return fieldValue != null && fieldValue.before(value);+ return fieldValue != null && fieldValue.before(date);else- return fieldValue != null && fieldValue.after(value);+ return fieldValue != null && fieldValue.after(date);}@Override@@ -52,7 +52,8 @@ public class DateFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator)+ + " " + IssueQuery.quote(value);}}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 7b51db687f..fe3c6f2ffc 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,6 @@ import javax.persistence.criteria.Predicate;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.util.IssueConstants;@@ -22,7 +21,7 @@ public class DescriptionCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Expression<String> attribute = root.get(IssueConstants.ATTR_DESCRIPTION);if (value != null)return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");@@ -45,10 +44,13 @@ public class DescriptionCriteria extends IssueCriteria {@Overridepublic String toString() {- if (value != null)- return IssueQuery.quote(IssueConstants.FIELD_DESCRIPTION) + " " + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " " + IssueQuery.quote(value);- else- return IssueQuery.quote(IssueConstants.FIELD_DESCRIPTION) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);+ if (value != null) {+ return IssueQuery.quote(IssueConstants.FIELD_DESCRIPTION) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " " + IssueQuery.quote(value);+ } else {+ return IssueQuery.quote(IssueConstants.FIELD_DESCRIPTION) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);+ }}}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 f11f2dc4f7..7597260d86 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,7 +14,6 @@ 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.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.util.IssueConstants;@@ -34,13 +33,13 @@ public abstract class FieldCriteria extends IssueCriteria {}@Override- public final Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public final Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Join<?, ?> join = root.join(IssueConstants.ATTR_FIELDS, JoinType.LEFT);Predicate namePredicate = builder.equal(join.get(IssueField.ATTR_NAME), getFieldName());- return builder.and(namePredicate, getValuePredicate(project, join, builder, user));+ return builder.and(namePredicate, getValuePredicate(join, builder, user));}- protected abstract Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user);+ protected abstract Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user);@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 17dc24ff2e..892dfce11d 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,7 +10,6 @@ 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.util.SecurityUtils;@@ -26,7 +25,7 @@ public class FieldOperatorCriteria extends FieldCriteria {}@Override- protected Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {Path<?> attribute = field.get(IssueField.ATTR_VALUE);if (operator == IssueQueryLexer.IsEmpty)return builder.isNull(attribute);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 ae701cb9f1..636c7b15b6 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@@ -8,6 +8,7 @@ import java.util.Collection;import java.util.HashSet;import java.util.Set;+import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -19,17 +20,23 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import io.onedev.server.OneDev;+import io.onedev.server.OneException;import io.onedev.server.entitymanager.IssueManager;+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.IssueConstants;import io.onedev.server.util.IssueUtils;+import io.onedev.server.util.ProjectAwareCommitId;public class FixedBetweenCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;+ private final Project project;+private final int sinceType;private final String sinceValue;@@ -42,18 +49,35 @@ public class FixedBetweenCriteria extends IssueCriteria {private final ObjectId untilCommitId;- public FixedBetweenCriteria(int sinceType, String sinceValue, ObjectId sinceCommitId,- int untilType, String untilValue, ObjectId untilCommitId) {+ public FixedBetweenCriteria(@Nullable Project project, int sinceType, String sinceValue, int untilType, String untilValue) {this.sinceType = sinceType;this.sinceValue = sinceValue;- this.sinceCommitId = sinceCommitId;this.untilType = untilType;this.untilValue = untilValue;- this.untilCommitId = untilCommitId;++ ProjectAwareCommitId since = getCommitId(project, sinceType, sinceValue);+ ProjectAwareCommitId until = getCommitId(project, untilType, untilValue);+ sinceCommitId = since.getCommitId();+ untilCommitId = until.getCommitId();+ if (since.getProject().equals(until.getProject())) {+ this.project = since.getProject();+ } else {+ throw new OneException("'" + getRuleName(IssueQueryLexer.FixedBetween)+ + "' should be used for same projects");+ }+ }++ private static ProjectAwareCommitId getCommitId(@Nullable Project project, int type, String value) {+ if (type == IssueQueryLexer.Build) {+ Build build = EntityQuery.getBuild(project, value);+ return new ProjectAwareCommitId(build.getProject(), build.getCommitId());+ } else {+ return EntityQuery.getCommitId(project, value);+ }}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Set<Long> fixedIssueNumbers = new HashSet<>();Repository repository = project.getRepository();@@ -67,33 +91,39 @@ public class FixedBetweenCriteria extends IssueCriteria {} catch (IOException e) {throw new RuntimeException(e);}-++ Predicate issuePredicate;Path<Long> attribute = root.get(IssueConstants.ATTR_NUMBER);if (fixedIssueNumbers.size() > IN_CLAUSE_LIMIT) {Collection<Long> allIssueNumbers = OneDev.getInstance(IssueManager.class).getIssueNumbers(project.getId());- return inManyValues(builder, attribute, fixedIssueNumbers, allIssueNumbers);+ issuePredicate = inManyValues(builder, attribute, fixedIssueNumbers, allIssueNumbers);} else if (!fixedIssueNumbers.isEmpty()) {- return root.get(IssueConstants.ATTR_NUMBER).in(fixedIssueNumbers);+ issuePredicate = root.get(IssueConstants.ATTR_NUMBER).in(fixedIssueNumbers);} else {- return builder.disjunction();+ issuePredicate = builder.disjunction();}+ return builder.and(builder.equal(root.get(IssueConstants.ATTR_PROJECT), project), issuePredicate);}@Overridepublic boolean matches(Issue issue, User user) {- Repository repository = issue.getProject().getRepository();- try (RevWalk revWalk = new RevWalk(repository)) {- revWalk.markStart(revWalk.parseCommit(untilCommitId));- revWalk.markUninteresting(revWalk.parseCommit(sinceCommitId));+ if (project.equals(issue.getProject())) {+ Repository repository = issue.getProject().getRepository();+ try (RevWalk revWalk = new RevWalk(repository)) {+ revWalk.markStart(revWalk.parseCommit(untilCommitId));+ revWalk.markUninteresting(revWalk.parseCommit(sinceCommitId));- RevCommit commit;- while ((commit = revWalk.next()) != null) {- if (IssueUtils.parseFixedIssues(issue.getProject(), commit.getFullMessage()).contains(issue.getNumber()))- return true;+ RevCommit commit;+ while ((commit = revWalk.next()) != null) {+ if (IssueUtils.parseFixedIssues(project, commit.getFullMessage()).contains(issue.getNumber()))+ return true;+ }+ return false;+ } catch (IOException e) {+ throw new RuntimeException(e);}+ } else {return false;- } catch (IOException e) {- throw new RuntimeException(e);}}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 072ed9a202..cebe25f846 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@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.issue;import java.util.Collection;+import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -10,6 +11,7 @@ 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.IssueConstants;public class FixedInCriteria extends IssueCriteria {@@ -18,22 +20,34 @@ public class FixedInCriteria extends IssueCriteria {private final Build build;+ private final String value;++ public FixedInCriteria(@Nullable Project project, String value) {+ build = EntityQuery.getBuild(project, value);+ this.value = value;+ }+public FixedInCriteria(Build build) {this.build = build;+ value = String.valueOf(build.getNumber());}-+@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Collection<Long> fixedIssueNumbers = build.getFixedIssueNumbers();- if (!fixedIssueNumbers.isEmpty())- return root.get(IssueConstants.ATTR_NUMBER).in(fixedIssueNumbers);- else+ if (!fixedIssueNumbers.isEmpty()) {+ return builder.and(+ builder.equal(root.get(IssueConstants.ATTR_PROJECT), build.getProject()),+ root.get(IssueConstants.ATTR_NUMBER).in(fixedIssueNumbers));+ } else {return builder.disjunction();+ }}@Overridepublic boolean matches(Issue issue, User user) {- return build.getFixedIssueNumbers().contains(issue.getNumber());+ return issue.getProject().equals(build.getProject())+ && build.getFixedIssueNumbers().contains(issue.getNumber());}@Override@@ -43,7 +57,7 @@ public class FixedInCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.getRuleName(IssueQueryLexer.FixedInBuild) + IssueQuery.quote("#" + build.getNumber());+ return IssueQuery.getRuleName(IssueQueryLexer.FixedInBuild) + " " + IssueQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.javaindex d9d4d98808..9630d47c86 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java@@ -6,13 +6,8 @@ import java.util.List;import java.util.Set;import javax.annotation.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Predicate;-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.EntityCriteria;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;@@ -21,9 +16,6 @@ public abstract class IssueCriteria extends EntityCriteria<Issue> {private static final long serialVersionUID = 1L;- public abstract Predicate getPredicate(@Nullable Project project, Root<Issue> root,- CriteriaBuilder builder, @Nullable User user);-public final void fill(Issue issue) {fill(issue, new HashSet<>());}@@ -70,4 +62,5 @@ public abstract class IssueCriteria extends EntityCriteria<Issue> {public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {return false;}+}diff --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.javanew file mode 100644index 0000000000..5f62b5413a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java@@ -0,0 +1,56 @@+package io.onedev.server.search.entity.issue;++import java.util.Objects;++import javax.annotation.Nullable;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Join;+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.IssueConstants;++public class IssueFieldCriteria extends FieldCriteria {++ private static final long serialVersionUID = 1L;++ private final Issue issue;++ private final String value;++ public IssueFieldCriteria(String name, @Nullable Project project, String value) {+ super(name);+ issue = EntityQuery.getIssue(project, value);+ this.value = value;+ }++ @Override+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {+ return builder.and(+ builder.equal(field.getParent().get(IssueConstants.ATTR_PROJECT), issue.getProject()),+ builder.equal(field.get(IssueField.ATTR_ORDINAL), issue.getNumber()));+ }++ @Override+ public boolean matches(Issue issue, User user) {+ Object fieldValue = issue.getFieldValue(getFieldName());+ return issue.getProject().equals(this.issue.getProject()) && Objects.equals(fieldValue, this.issue.getNumber());+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return IssueQuery.quote(getFieldName()) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ + IssueQuery.quote(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4index abf1c89c66..624c28a559 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4@@ -7,7 +7,7 @@ query;criteria- : operator=(Mine|SubmittedByMe) #OperatorCriteria+ : operator=SubmittedByMe #OperatorCriteria| operator=(SubmittedBy|FixedInBuild) WS+ criteriaValue=Quoted #OperatorValueCriteria| FixedBetween WS+ revisionCriteria WS+ And WS+ revisionCriteria #FixedBetweenCriteria| criteriaField=Quoted WS+ operator=(IsMe|IsEmpty) #FieldOperatorCriteria@@ -26,10 +26,6 @@ order: orderField=Quoted WS* (WS+ direction=(Asc|Desc))?;-Mine- : 'mine'- ;-All: 'all';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 22ebd1615b..cc70665e79 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -1,11 +1,18 @@package io.onedev.server.search.entity.issue;-import static io.onedev.server.util.IssueConstants.*;+import static io.onedev.server.util.IssueConstants.FIELD_COMMENT;+import static io.onedev.server.util.IssueConstants.FIELD_COMMENT_COUNT;+import static io.onedev.server.util.IssueConstants.FIELD_DESCRIPTION;+import static io.onedev.server.util.IssueConstants.FIELD_MILESTONE;+import static io.onedev.server.util.IssueConstants.FIELD_NUMBER;+import static io.onedev.server.util.IssueConstants.FIELD_STATE;+import static io.onedev.server.util.IssueConstants.FIELD_SUBMIT_DATE;+import static io.onedev.server.util.IssueConstants.FIELD_TITLE;+import static io.onedev.server.util.IssueConstants.FIELD_UPDATE_DATE;+import static io.onedev.server.util.IssueConstants.FIELD_VOTE_COUNT;-import java.io.IOException;import java.util.ArrayList;import java.util.Collection;-import java.util.Date;import java.util.HashSet;import java.util.Iterator;import java.util.List;@@ -21,8 +28,6 @@ import org.antlr.v4.runtime.CharStreams;import org.antlr.v4.runtime.CommonTokenStream;import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;-import org.eclipse.jgit.errors.RevisionSyntaxException;-import org.eclipse.jgit.lib.ObjectId;import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.server.OneDev;@@ -131,8 +136,6 @@ public class IssueQuery extends EntityQuery<Issue> {@Overridepublic IssueCriteria visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {- case IssueQueryLexer.Mine:- return new MineCriteria();case IssueQueryLexer.SubmittedByMe:return new SubmittedByMeCriteria();default:@@ -156,45 +159,25 @@ public class IssueQuery extends EntityQuery<Issue> {public IssueCriteria visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {String value = getValue(ctx.Quoted().getText());- if (ctx.SubmittedBy() != null) {+ if (ctx.SubmittedBy() != null)return new SubmittedByCriteria(getUser(value), value);- } else if (ctx.FixedInBuild() != null) {- if (project != null)- return new FixedInCriteria(getBuild(project, value));- else- throw new OneException("Unsupported criteria in global issue query: " + getRuleName(IssueQueryLexer.FixedInBuild));- } else {+ else if (ctx.FixedInBuild() != null)+ return new FixedInCriteria(project, value);+ elsethrow new RuntimeException("Unexpected operator: " + ctx.operator.getText());- }- }-- private ObjectId getCommitId(Project project, RevisionCriteriaContext revision) {- String value = getValue(revision.Quoted().getText());- if (revision.Build() != null) {- return ObjectId.fromString(getBuild(project, value).getCommitHash());- } else {- try {- return project.getRepository().resolve(value);- } catch (RevisionSyntaxException | IOException e) {- throw new OneException("Invalid revision: " + value);- }- }}+ @Overridepublic IssueCriteria visitFixedBetweenCriteria(FixedBetweenCriteriaContext ctx) {- if (project == null)- throw new OneException("Unsupported criteria in global issue query: " + getRuleName(IssueQueryLexer.FixedBetween));-RevisionCriteriaContext sinceRevision = ctx.revisionCriteria(0);int sinceType = sinceRevision.revisionType.getType();String sinceValue = getValue(sinceRevision.Quoted().getText());- ObjectId sinceCommitId = getCommitId(project, sinceRevision);RevisionCriteriaContext untilRevision = ctx.revisionCriteria(1);int untilType = untilRevision.revisionType.getType();String untilValue = getValue(untilRevision.Quoted().getText());- ObjectId untilCommitId = getCommitId(project, untilRevision);- return new FixedBetweenCriteria(sinceType, sinceValue, sinceCommitId, untilType, untilValue, untilCommitId);++ return new FixedBetweenCriteria(project, sinceType, sinceValue, untilType, untilValue);}@Override@@ -213,13 +196,12 @@ public class IssueQuery extends EntityQuery<Issue> {switch (operator) {case IssueQueryLexer.IsBefore:case IssueQueryLexer.IsAfter:- Date dateValue = getDateValue(value);if (fieldName.equals(FIELD_SUBMIT_DATE))- return new SubmitDateCriteria(dateValue, value, operator);+ return new SubmitDateCriteria(value, operator);else if (fieldName.equals(FIELD_UPDATE_DATE))- return new UpdateDateCriteria(dateValue, value, operator);+ return new UpdateDateCriteria(value, operator);else- return new DateFieldCriteria(fieldName, dateValue, value, operator);+ return new DateFieldCriteria(fieldName, value, operator);case IssueQueryLexer.Contains:if (fieldName.equals(FIELD_TITLE)) {return new TitleCriteria(value);@@ -253,12 +235,12 @@ public class IssueQuery extends EntityQuery<Issue> {return new NumberCriteria(getIntValue(value), operator);} else {FieldSpec field = getIssueSetting().getFieldSpec(fieldName);- if (field instanceof IssueChoiceField || field instanceof BuildChoiceField- || field instanceof PullRequestChoiceField) {- value = value.trim();- if (value.startsWith("#"))- value = value.substring(1);- return new ReferenceableFieldCriteria(fieldName, getIntValue(value));+ if (field instanceof IssueChoiceField) {+ return new IssueFieldCriteria(fieldName, project, value);+ } else if (field instanceof BuildChoiceField) {+ return new BuildFieldCriteria(fieldName, project, value);+ } else if (field instanceof PullRequestChoiceField) {+ return new PullRequestFieldCriteria(fieldName, project, value);} else if (field instanceof BooleanField) {return new BooleanFieldCriteria(fieldName, getBooleanValue(value));} else if (field instanceof NumberField) {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 cd5c424a43..db536683b6 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,6 @@ import javax.persistence.criteria.Root;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.util.IssueConstants;@@ -19,29 +18,29 @@ public class MilestoneCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;- private final String value;+ private final String milestoneName;- public MilestoneCriteria(@Nullable String value) {- this.value = value;+ public MilestoneCriteria(@Nullable String milestoneName) {+ this.milestoneName = milestoneName;}public String getValue() {- return value;+ return milestoneName;}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {- Path<?> attribute = root.join(IssueConstants.ATTR_MILESTONE, JoinType.LEFT).get(Milestone.FIELD_ATTR_NAME);- if (value != null)- return builder.equal(attribute, value);+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ Path<?> attribute = root.join(IssueConstants.ATTR_MILESTONE, JoinType.LEFT).get(Milestone.ATTR_NAME);+ if (milestoneName != null)+ return builder.equal(attribute, milestoneName);elsereturn builder.isNull(attribute);}@Overridepublic boolean matches(Issue issue, User user) {- if (value != null)- return issue.getMilestone() != null && issue.getMilestone().getName().equals(value);+ if (milestoneName != null)+ return issue.getMilestone() != null && issue.getMilestone().getName().equals(milestoneName);elsereturn issue.getMilestone() == null;}@@ -53,16 +52,20 @@ public class MilestoneCriteria extends IssueCriteria {@Overridepublic String toString() {- if (value != null)- return IssueQuery.quote(IssueConstants.FIELD_MILESTONE) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(value);- else- return IssueQuery.quote(IssueConstants.FIELD_MILESTONE) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);+ if (milestoneName != null) {+ return IssueQuery.quote(IssueConstants.FIELD_MILESTONE) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ + IssueQuery.quote(milestoneName);+ } else {+ return IssueQuery.quote(IssueConstants.FIELD_MILESTONE) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);+ }}@Overridepublic void fill(Issue issue, Set<String> initedLists) {- if (value != null)- issue.setMilestone(issue.getProject().getMilestone(value));+ if (milestoneName != null)+ issue.setMilestone(issue.getProject().getMilestone(milestoneName));}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.javadeleted file mode 100644index 030698e71f..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java+++ /dev/null@@ -1,61 +0,0 @@-package io.onedev.server.search.entity.issue;--import java.util.ArrayList;-import java.util.List;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Predicate;-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.Project;-import io.onedev.server.model.User;-import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;--public class MineCriteria extends IssueCriteria {-- private static final long serialVersionUID = 1L;-- private IssueCriteria getCriteria(Project project, User user) {- IssueCriteria submitterCriteria = new SubmittedByCriteria(user, user.getName());- List<IssueCriteria> fieldCriterias = new ArrayList<>();- IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- for (FieldSpec field: issueSetting.getFieldSpecs()) {- if (field instanceof UserChoiceField) {- IssueCriteria fieldCriteria = new FieldOperatorCriteria(field.getName(), IssueQueryLexer.IsMe);- fieldCriterias.add(fieldCriteria);- }- }- if (!fieldCriterias.isEmpty()) {- fieldCriterias.add(0, submitterCriteria);- return new OrCriteria(fieldCriterias);- } else {- return submitterCriteria;- }- }-- @Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {- return getCriteria(project, user).getPredicate(project, root, builder, user);- }-- @Override- public boolean matches(Issue issue, User user) {- return getCriteria(issue.getProject(), user).matches(issue, user);- }-- @Override- public boolean needsLogin() {- return true;- }-- @Override- public String toString() {- return IssueQuery.getRuleName(IssueQueryLexer.Mine);- }--}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 14cd2bfe0b..6fe8ff3cdf 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,6 @@ import javax.persistence.criteria.Predicate;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.NotCriteriaHelper;import io.onedev.server.util.ValueSetEdit;@@ -24,8 +23,8 @@ public class NotCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {- return new NotCriteriaHelper<Issue>(criteria).getPredicate(project, root, builder, user);+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ return new NotCriteriaHelper<Issue>(criteria).getPredicate(root, builder, user);}@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 18f81d7d5e..a8dc968cc8 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@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;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.util.IssueConstants;@@ -24,7 +23,7 @@ public class NumberCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Path<Long> attribute = root.get(IssueConstants.ATTR_NUMBER);if (operator == IssueQueryLexer.Is)return builder.equal(attribute, value);@@ -51,7 +50,9 @@ public class NumberCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_NUMBER) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(IssueConstants.FIELD_NUMBER) + " "+ + IssueQuery.getRuleName(operator) + " "+ + IssueQuery.quote(String.valueOf(value));}}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 a12a58e800..45fc4a48d3 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,6 @@ 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;public class NumericFieldCriteria extends FieldCriteria {@@ -28,7 +27,7 @@ public class NumericFieldCriteria extends FieldCriteria {}@Override- protected Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {Path<Integer> attribute = field.get(IssueField.ATTR_ORDINAL);if (operator == IssueQueryLexer.Is)return builder.equal(attribute, value);@@ -56,7 +55,8 @@ public class NumericFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " "+ + IssueQuery.quote(String.valueOf(value));}@Overridediff --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 0a2a6526f9..524ec4e0ca 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,6 @@ import javax.persistence.criteria.Predicate;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.OrCriteriaHelper;import io.onedev.server.search.entity.ParensAware;@@ -30,8 +29,8 @@ public class OrCriteria extends IssueCriteria implements ParensAware {}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {- return new OrCriteriaHelper<Issue>(criterias).getPredicate(project, root, builder, user);+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ return new OrCriteriaHelper<Issue>(criterias).getPredicate(root, builder, user);}@Overridediff --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.javanew file mode 100644index 0000000000..b9b14e9e4b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java@@ -0,0 +1,57 @@+package io.onedev.server.search.entity.issue;++import java.util.Objects;++import javax.annotation.Nullable;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Join;+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.PullRequest;+import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.util.IssueConstants;++public class PullRequestFieldCriteria extends FieldCriteria {++ private static final long serialVersionUID = 1L;++ private final PullRequest request;++ private final String value;++ public PullRequestFieldCriteria(String name, @Nullable Project project, String value) {+ super(name);+ request = EntityQuery.getPullRequest(project, value);+ this.value = value;+ }++ @Override+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {+ return builder.and(+ builder.equal(field.getParent().get(IssueConstants.ATTR_PROJECT), request.getTargetProject()),+ builder.equal(field.get(IssueField.ATTR_ORDINAL), request.getNumber()));+ }++ @Override+ public boolean matches(Issue issue, User user) {+ Object fieldValue = issue.getFieldValue(getFieldName());+ return issue.getProject().equals(request.getTargetProject()) && Objects.equals(fieldValue, request.getNumber());+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return IssueQuery.quote(getFieldName()) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ + IssueQuery.quote(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.javadeleted file mode 100644index 07c379ae57..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java+++ /dev/null@@ -1,46 +0,0 @@-package io.onedev.server.search.entity.issue;--import java.util.Objects;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-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;--public class ReferenceableFieldCriteria extends FieldCriteria {-- private static final long serialVersionUID = 1L;-- private final long value;-- public ReferenceableFieldCriteria(String name, long value) {- super(name);- this.value = value;- }-- @Override- protected Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {- return builder.equal(field.get(IssueField.ATTR_ORDINAL), value);- }-- @Override- public boolean matches(Issue issue, User user) {- Object fieldValue = issue.getFieldValue(getFieldName());- return Objects.equals(fieldValue, value);- }-- @Override- public boolean needsLogin() {- return false;- }-- @Override- public 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/StateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.javaindex ea52e61697..3a1f6963bd 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,6 @@ 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.Project;import io.onedev.server.model.User;import io.onedev.server.util.IssueConstants;@@ -28,7 +27,7 @@ public class StateCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Path<?> attribute = root.get(IssueConstants.ATTR_STATE);return builder.equal(attribute, value);}@@ -50,7 +49,8 @@ public class StateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_STATE) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(IssueConstants.FIELD_STATE) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(value);}@Overridediff --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 caf20d366e..3a4fcbe83d 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,6 @@ 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;public class StringFieldCriteria extends FieldCriteria {@@ -31,7 +30,7 @@ public class StringFieldCriteria extends FieldCriteria {}@Override- protected Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {+ protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {Path<String> attribute = field.get(IssueField.ATTR_VALUE);if (operator == IssueQueryLexer.Is)return builder.equal(builder.lower(attribute), value.toLowerCase());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 75583fabed..21ae20e123 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,8 +8,8 @@ import javax.persistence.criteria.Predicate;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.IssueConstants;public class SubmitDateCriteria extends IssueCriteria {@@ -18,31 +18,31 @@ public class SubmitDateCriteria extends IssueCriteria {private final int operator;- private final Date value;+ private final String value;- private final String rawValue;+ private final Date date;- public SubmitDateCriteria(Date value, String rawValue, int operator) {+ public SubmitDateCriteria(String value, int operator) {+ date = EntityQuery.getDateValue(value);this.operator = operator;this.value = value;- this.rawValue = rawValue;}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Path<Date> attribute = root.get(IssueConstants.ATTR_SUBMIT_DATE);if (operator == IssueQueryLexer.IsBefore)- return builder.lessThan(attribute, value);+ return builder.lessThan(attribute, date);else- return builder.greaterThan(attribute, value);+ return builder.greaterThan(attribute, date);}@Overridepublic boolean matches(Issue issue, User user) {if (operator == IssueQueryLexer.IsBefore)- return issue.getSubmitDate().before(value);+ return issue.getSubmitDate().before(date);else- return issue.getSubmitDate().after(value);+ return issue.getSubmitDate().after(date);}@Override@@ -52,7 +52,8 @@ public class SubmitDateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_SUBMIT_DATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);+ return IssueQuery.quote(IssueConstants.FIELD_SUBMIT_DATE) + " "+ + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);}}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 f063eae7e5..2661c95c9b 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@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;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.util.IssueConstants;@@ -26,7 +25,7 @@ public class SubmittedByCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(IssueConstants.ATTR_SUBMITTER);return builder.equal(attribute, 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 fbf2a2a1b4..95884ec625 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@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;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.util.IssueConstants;@@ -17,7 +16,7 @@ public class SubmittedByMeCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(IssueConstants.ATTR_SUBMITTER);return builder.equal(attribute, user);}diff --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 cb1d182bf1..3bd9f11169 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@@ -6,7 +6,6 @@ import javax.persistence.criteria.Predicate;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.util.IssueConstants;@@ -21,7 +20,7 @@ public class TitleCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Path<String> attribute = root.get(IssueConstants.ATTR_TITLE);return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");}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 e0d038ab22..afdddbcf96 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,8 +8,8 @@ import javax.persistence.criteria.Predicate;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.IssueConstants;public class UpdateDateCriteria extends IssueCriteria {@@ -18,31 +18,31 @@ public class UpdateDateCriteria extends IssueCriteria {private final int operator;- private final Date value;+ private final String value;- private final String rawValue;+ private final Date date;- public UpdateDateCriteria(Date value, String rawValue, int operator) {+ public UpdateDateCriteria(String value, int operator) {+ date = EntityQuery.getDateValue(value);this.operator = operator;this.value = value;- this.rawValue = rawValue;}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Path<Date> attribute = IssueQuery.getPath(root, IssueConstants.ATTR_UPDATE_DATE);if (operator == IssueQueryLexer.IsBefore)- return builder.lessThan(attribute, value);+ return builder.lessThan(attribute, date);else- return builder.greaterThan(attribute, value);+ return builder.greaterThan(attribute, date);}@Overridepublic boolean matches(Issue issue, User user) {if (operator == IssueQueryLexer.IsBefore)- return issue.getUpdateDate().before(value);+ return issue.getUpdateDate().before(date);else- return issue.getUpdateDate().after(value);+ return issue.getUpdateDate().after(date);}@Override@@ -52,7 +52,8 @@ public class UpdateDateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_UPDATE_DATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);+ return IssueQuery.quote(IssueConstants.FIELD_UPDATE_DATE) + " "+ + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);}}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 e7d406b972..37553d7dc9 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,6 @@ import javax.persistence.criteria.Predicate;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.util.IssueConstants;@@ -24,7 +23,7 @@ public class VoteCountCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Path<Integer> attribute = root.get(IssueConstants.ATTR_VOTE_COUNT);if (operator == IssueQueryLexer.Is)return builder.equal(attribute, value);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 ac60e1d276..6539cfef31 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@@ -6,7 +6,6 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;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.AndCriteriaHelper;@@ -23,8 +22,8 @@ public class AndCriteria extends PullRequestCriteria implements ParensAware {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {- return new AndCriteriaHelper<PullRequest>(criterias).getPredicate(project, root, builder, user);+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ return new AndCriteriaHelper<PullRequest>(criterias).getPredicate(root, builder, user);}@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 376903680a..c26ec9a0c0 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@@ -7,7 +7,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -25,7 +24,7 @@ public class ApprovedByCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);@@ -50,7 +49,8 @@ public class ApprovedByCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.ApprovedBy) + " " + PullRequestQuery.quote(value.getName());+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.ApprovedBy) + " "+ + PullRequestQuery.quote(value.getName());}}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 bfb1682102..ebf4839cba 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,7 +7,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -19,7 +18,7 @@ public class ApprovedByMeCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);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 efb03cc802..857892e21f 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@@ -7,9 +7,9 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.EntityQuery;import io.onedev.server.util.PullRequestConstants;public class CloseDateCriteria extends PullRequestCriteria {@@ -18,32 +18,32 @@ public class CloseDateCriteria extends PullRequestCriteria {private final int operator;- private final Date value;+ private final Date date;- private final String rawValue;+ private final String value;- public CloseDateCriteria(Date value, String rawValue, int operator) {+ public CloseDateCriteria(String value, int operator) {this.operator = operator;this.value = value;- this.rawValue = rawValue;+ date = EntityQuery.getDateValue(value);}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<Date> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_DATE);if (operator == PullRequestQueryLexer.IsBefore)- return builder.lessThan(attribute, value);+ return builder.lessThan(attribute, date);else- return builder.greaterThan(attribute, value);+ return builder.greaterThan(attribute, date);}@Overridepublic boolean matches(PullRequest request, User user) {if (request.getCloseInfo() != null) {if (operator == PullRequestQueryLexer.IsBefore)- return request.getCloseInfo().getDate().before(value);+ return request.getCloseInfo().getDate().before(date);else- return request.getCloseInfo().getDate().after(value);+ return request.getCloseInfo().getDate().after(date);} else {return false;}@@ -56,7 +56,8 @@ public class CloseDateCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_CLOSE_DATE) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(rawValue);+ return PullRequestQuery.quote(PullRequestConstants.FIELD_CLOSE_DATE) + " "+ + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(value);}}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 f36d79248d..d1d8b466da 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@@ -5,7 +5,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.util.PullRequestConstants;@@ -24,7 +23,7 @@ public class CommentCountCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<Long> attribute = root.get(PullRequestConstants.ATTR_COMMENT_COUNT);if (operator == PullRequestQueryLexer.Is)return builder.equal(attribute, 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 28c9f83c88..1298ccdaa2 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@@ -9,7 +9,6 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.CodeCommentRelation;import io.onedev.server.model.CodeCommentReply;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;import io.onedev.server.model.User;@@ -27,7 +26,7 @@ public class CommentCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(PullRequestConstants.ATTR_COMMENTS, JoinType.LEFT);Path<String> attribute = join.get(PullRequestComment.ATTR_CONTENT);Predicate commentPredicate = builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");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 47d0928789..b625060c84 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@@ -5,7 +5,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.util.PullRequestConstants;@@ -21,7 +20,7 @@ public class DescriptionCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<String> attribute = root.get(PullRequestConstants.ATTR_DESCRIPTION);return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");}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 442771214d..3b28492653 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@@ -7,7 +7,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.util.PullRequestConstants;@@ -23,7 +22,7 @@ public class DiscardedByCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<User> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_USER);return builder.equal(attribute, value);}diff --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 9b253c3c18..bd4f3e4df1 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@@ -7,7 +7,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.util.PullRequestConstants;@@ -17,7 +16,7 @@ public class DiscardedByMeCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<User> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_USER);return builder.equal(attribute, user);}diff --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 abe71ce2c0..a62b9a11f2 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@@ -4,7 +4,6 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;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.model.support.pullrequest.CloseInfo;@@ -13,18 +12,18 @@ public class DiscardedCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;- private PullRequestCriteria getCriteria(Project project) {+ private PullRequestCriteria getCriteria() {return new StatusCriteria(CloseInfo.Status.DISCARDED.toString());}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {- return getCriteria(project).getPredicate(project, root, builder, user);+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ return getCriteria().getPredicate(root, builder, user);}@Overridepublic boolean matches(PullRequest request, User user) {- return getCriteria(request.getTargetProject()).matches(request, user);+ return getCriteria().matches(request, user);}@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 c51552ae5f..afd75004b4 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@@ -8,9 +8,8 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.PullRequestBuild;-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.util.PullRequestConstants;@@ -19,7 +18,7 @@ public class HasFailedBuildsCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(PullRequestConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT).join(PullRequestBuild.ATTR_BUILD, JoinType.INNER);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 491f7238ea..1ae1761ca7 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@@ -5,7 +5,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.model.support.pullrequest.MergePreview;@@ -16,7 +15,7 @@ public class HasMergeConflictsCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<?> requestHead = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_LAST_MERGE_PREVIEW_REQUEST_HEAD);Path<?> merged = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_LAST_MERGE_PREVIEW_MERGED);return builder.and(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 c8f7cfe208..061ad1f58d 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@@ -7,7 +7,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -19,7 +18,7 @@ public class HasPendingReviewsCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);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 44d7ccafd3..794532ba46 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@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.pullrequest;import java.util.Collection;+import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -13,34 +14,46 @@ import io.onedev.server.cache.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.EntityQuery;+import io.onedev.server.util.ProjectAwareCommitId;import io.onedev.server.util.PullRequestConstants;public class IncludesCommitCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;+ private final Project project;+private final ObjectId commitId;- public IncludesCommitCriteria(ObjectId commitId) {- this.commitId = commitId;+ private final String value;++ public IncludesCommitCriteria(@Nullable Project project, String value) {+ ProjectAwareCommitId commitId = EntityQuery.getCommitId(project, value);+ this.project = commitId.getProject();+ this.commitId = commitId.getCommitId();+ this.value = value;}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {- Collection<Long> pullRequestIds = getPullRequestIds(project);- if (!pullRequestIds.isEmpty())- return root.get(PullRequestConstants.ATTR_ID).in(pullRequestIds);- else+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ Collection<Long> pullRequestIds = getPullRequestIds();+ if (!pullRequestIds.isEmpty()) {+ return builder.and(+ builder.equal(root.get(PullRequestConstants.ATTR_TARGET_PROJECT), project),+ root.get(PullRequestConstants.ATTR_ID).in(pullRequestIds));+ } else {return builder.disjunction();+ }}- private Collection<Long> getPullRequestIds(Project project) {+ private Collection<Long> getPullRequestIds() {return OneDev.getInstance(CodeCommentRelationInfoManager.class).getPullRequestIds(project, commitId);}@Overridepublic boolean matches(PullRequest request, User user) {- return getPullRequestIds(request.getTargetProject()).contains(request.getId());+ return request.getTargetProject().equals(project) && getPullRequestIds().contains(request.getId());}@Override@@ -51,7 +64,7 @@ public class IncludesCommitCriteria extends PullRequestCriteria {@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.IncludesCommit) + " "- + PullRequestQuery.quote(commitId.name());+ + PullRequestQuery.quote(value);}}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 abe79283c6..8c6e0d6dd5 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.pullrequest;import java.util.Collection;import java.util.HashSet;+import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -16,37 +17,45 @@ 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.EntityQuery;import io.onedev.server.util.PullRequestConstants;public class IncludesIssueCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;- private Issue value;+ private final Issue issue;- public IncludesIssueCriteria(Issue value) {+ private final String value;++ public IncludesIssueCriteria(@Nullable Project project, String value) {+ issue = EntityQuery.getIssue(project, value);this.value = value;}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {- Collection<Long> pullRequestIds = getPullRequestIds(project);- if (!pullRequestIds.isEmpty())- return root.get(PullRequestConstants.ATTR_ID).in(pullRequestIds);- else+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ Collection<Long> pullRequestIds = getPullRequestIds(issue.getProject());+ if (!pullRequestIds.isEmpty()) {+ return builder.and(+ builder.equal(root.get(PullRequestConstants.ATTR_TARGET_PROJECT), issue.getProject()),+ root.get(PullRequestConstants.ATTR_ID).in(pullRequestIds));+ } else {return builder.disjunction();+ }}private Collection<Long> getPullRequestIds(Project project) {Collection<Long> pullRequestIds = new HashSet<>();- for (ObjectId commit: OneDev.getInstance(CommitInfoManager.class).getFixCommits(project, value.getNumber()))+ for (ObjectId commit: OneDev.getInstance(CommitInfoManager.class).getFixCommits(project, issue.getNumber()))pullRequestIds.addAll(OneDev.getInstance(CodeCommentRelationInfoManager.class).getPullRequestIds(project, commit));return pullRequestIds;}@Overridepublic boolean matches(PullRequest request, User user) {- return getPullRequestIds(request.getTargetProject()).contains(request.getId());+ return request.getTargetProject().equals(issue.getProject())+ && getPullRequestIds(request.getTargetProject()).contains(request.getId());}@Override@@ -57,7 +66,7 @@ public class IncludesIssueCriteria extends PullRequestCriteria {@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.IncludesIssue) + " "- + PullRequestQuery.quote("#" + value.getNumber());+ + PullRequestQuery.quote(value);}}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 d3af79a145..c2cf715350 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@@ -5,7 +5,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.model.support.pullrequest.MergeStrategy;@@ -22,7 +21,7 @@ public class MergeStrategyCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<?> attribute = root.get(PullRequestConstants.ATTR_MERGE_STRATEGY);return builder.equal(attribute, value);}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 a523258af1..273c4e1f2e 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@@ -4,7 +4,6 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;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.model.support.pullrequest.CloseInfo;@@ -13,18 +12,18 @@ public class MergedCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;- private PullRequestCriteria getCriteria(Project project) {+ private PullRequestCriteria getCriteria() {return new StatusCriteria(CloseInfo.Status.MERGED.toString());}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {- return getCriteria(project).getPredicate(project, root, builder, user);+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ return getCriteria().getPredicate(root, builder, user);}@Overridepublic boolean matches(PullRequest request, User user) {- return getCriteria(request.getTargetProject()).matches(request, user);+ return getCriteria().matches(request, user);}@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 53cc8b8ce2..ff1dabb2aa 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@@ -4,7 +4,6 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;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.NotCriteriaHelper;@@ -20,8 +19,8 @@ public class NotCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {- return new NotCriteriaHelper<PullRequest>(criteria).getPredicate(project, root, builder, user);+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ return new NotCriteriaHelper<PullRequest>(criteria).getPredicate(root, builder, user);}@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 682ba98212..da33ce2eaf 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@@ -5,7 +5,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.util.PullRequestConstants;@@ -24,7 +23,7 @@ public class NumberCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<Long> attribute = root.get(PullRequestConstants.ATTR_NUMBER);if (operator == PullRequestQueryLexer.Is)return builder.equal(attribute, value);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 371fed708f..3a21344636 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@@ -4,7 +4,6 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;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.util.PullRequestConstants;@@ -13,18 +12,18 @@ public class OpenCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;- private PullRequestCriteria getCriteria(Project project) {+ private PullRequestCriteria getCriteria() {return new StatusCriteria(PullRequestConstants.STATE_OPEN);}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {- return getCriteria(project).getPredicate(project, root, builder, user);+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ return getCriteria().getPredicate(root, builder, user);}@Overridepublic boolean matches(PullRequest request, User user) {- return getCriteria(request.getTargetProject()).matches(request, user);+ return getCriteria().matches(request, user);}@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 3e6cf942d3..f7c0f5ab75 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@@ -6,7 +6,6 @@ import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;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.OrCriteriaHelper;@@ -23,8 +22,8 @@ public class OrCriteria extends PullRequestCriteria implements ParensAware {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {- return new OrCriteriaHelper<PullRequest>(criterias).getPredicate(project, root, builder, user);+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ return new OrCriteriaHelper<PullRequest>(criterias).getPredicate(root, builder, user);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex e7ce280847..61cbef49d6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -1,7 +1,6 @@package io.onedev.server.search.entity.pullrequest;import java.util.ArrayList;-import java.util.Date;import java.util.List;import javax.annotation.Nullable;@@ -134,15 +133,9 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {case PullRequestQueryLexer.DiscardedBy:return new DiscardedByCriteria(getUser(value));case PullRequestQueryLexer.IncludesCommit:- if (project != null)- return new IncludesCommitCriteria(getCommitId(project, value));- else- throw new OneException("Unsupported criteria in global issue query: " + getRuleName(PullRequestQueryLexer.IncludesCommit));+ return new IncludesCommitCriteria(project, value);case PullRequestQueryLexer.IncludesIssue:- if (project != null)- return new IncludesIssueCriteria(getIssue(project, value));- else- throw new OneException("Unsupported criteria in global issue query: " + getRuleName(PullRequestQueryLexer.IncludesIssue));+ return new IncludesIssueCriteria(project, value);default:throw new OneException("Unexpected operator: " + ctx.operator.getText());}@@ -163,14 +156,13 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {switch (operator) {case PullRequestQueryLexer.IsBefore:case PullRequestQueryLexer.IsAfter:- Date dateValue = getDateValue(value);switch (fieldName) {case PullRequestConstants.FIELD_SUBMIT_DATE:- return new SubmitDateCriteria(dateValue, value, operator);+ return new SubmitDateCriteria(value, operator);case PullRequestConstants.FIELD_UPDATE_DATE:- return new UpdateDateCriteria(dateValue, value, operator);+ return new UpdateDateCriteria(value, operator);case PullRequestConstants.FIELD_CLOSE_DATE:- return new CloseDateCriteria(dateValue, value, operator);+ return new CloseDateCriteria(value, operator);default:throw new IllegalStateException();}diff --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 def07638b0..0ad7569500 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@@ -7,7 +7,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -25,7 +24,7 @@ public class RequestedForChangesByCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);@@ -50,7 +49,8 @@ public class RequestedForChangesByCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.RequestedForChangesBy) + " " + PullRequestQuery.quote(value.getName());+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.RequestedForChangesBy)+ + " " + PullRequestQuery.quote(value.getName());}}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 be66fe38e9..79e8668b8f 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,7 +7,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -19,7 +18,7 @@ public class RequestedForChangesByMeCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);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 242533ea3b..bb772626f1 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@@ -7,7 +7,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -19,7 +18,7 @@ public class SomeoneRequestedForChangesCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);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 9c9c97048c..6e93824a1e 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,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.util.PullRequestConstants;@@ -16,21 +15,21 @@ public class SourceBranchCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;- private final String value;+ private final String branch;public SourceBranchCriteria(String value) {- this.value = value;+ this.branch = value;}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(PullRequestConstants.ATTR_SOURCE_BRANCH);- return builder.equal(attribute, value);+ return builder.equal(attribute, branch);}@Overridepublic boolean matches(PullRequest request, User user) {- return Objects.equals(request.getSourceBranch(), value);+ return Objects.equals(request.getSourceBranch(), branch);}@Override@@ -40,7 +39,9 @@ public class SourceBranchCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_SOURCE_BRANCH) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);+ return PullRequestQuery.quote(PullRequestConstants.FIELD_SOURCE_BRANCH) + " "+ + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "+ + PullRequestQuery.quote(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 04f64076c5..dcfd79c48e 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@@ -23,7 +23,7 @@ public class SourceProjectCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(PullRequestConstants.ATTR_SOURCE_PROJECT);return builder.equal(attribute, value);}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 dad3c4446f..70edf5f5e4 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@@ -5,7 +5,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.model.support.pullrequest.CloseInfo;@@ -22,7 +21,7 @@ public class StatusCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<?> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_STATUS);if (value.equalsIgnoreCase(PullRequestConstants.STATE_OPEN))return builder.isNull(attribute);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 af4fd0b0cb..697108dcef 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@@ -7,9 +7,9 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.EntityQuery;import io.onedev.server.util.PullRequestConstants;public class SubmitDateCriteria extends PullRequestCriteria {@@ -18,31 +18,31 @@ public class SubmitDateCriteria extends PullRequestCriteria {private final int operator;- private final Date value;+ private final Date date;- private final String rawValue;+ private final String value;- public SubmitDateCriteria(Date value, String rawValue, int operator) {+ public SubmitDateCriteria(String value, int operator) {this.operator = operator;this.value = value;- this.rawValue = rawValue;+ date = EntityQuery.getDateValue(value);}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<Date> attribute = root.get(PullRequestConstants.ATTR_SUBMIT_DATE);if (operator == PullRequestQueryLexer.IsBefore)- return builder.lessThan(attribute, value);+ return builder.lessThan(attribute, date);else- return builder.greaterThan(attribute, value);+ return builder.greaterThan(attribute, date);}@Overridepublic boolean matches(PullRequest request, User user) {if (operator == PullRequestQueryLexer.IsBefore)- return request.getSubmitDate().before(value);+ return request.getSubmitDate().before(date);else- return request.getSubmitDate().after(value);+ return request.getSubmitDate().after(date);}@Override@@ -52,7 +52,8 @@ public class SubmitDateCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_SUBMIT_DATE) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(rawValue);+ return PullRequestQuery.quote(PullRequestConstants.FIELD_SUBMIT_DATE) + " "+ + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(value);}}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 be2cd499df..b609332845 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@@ -7,7 +7,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.util.PullRequestConstants;@@ -23,7 +22,7 @@ public class SubmittedByCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(PullRequestConstants.ATTR_SUBMITTER);return builder.equal(attribute, 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 79d1a0f2ab..8800d301b6 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@@ -7,7 +7,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.util.PullRequestConstants;@@ -17,7 +16,7 @@ public class SubmittedByMeCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<?> attribute = root.get(PullRequestConstants.ATTR_SUBMITTER);return builder.equal(attribute, user);}diff --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 fe1a2feaa6..2fbf26bc3d 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,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.util.PullRequestConstants;@@ -16,21 +15,21 @@ public class TargetBranchCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;- private final String value;+ private final String branch;public TargetBranchCriteria(String value) {- this.value = value;+ this.branch = value;}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(PullRequestConstants.ATTR_TARGET_BRANCH);- return builder.equal(attribute, value);+ return builder.equal(attribute, branch);}@Overridepublic boolean matches(PullRequest request, User user) {- return Objects.equals(request.getTargetBranch(), value);+ return Objects.equals(request.getTargetBranch(), branch);}@Override@@ -40,7 +39,9 @@ public class TargetBranchCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_TARGET_BRANCH) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);+ return PullRequestQuery.quote(PullRequestConstants.FIELD_TARGET_BRANCH) + " "+ + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "+ + PullRequestQuery.quote(branch);}}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 c5935592e5..f1258f8515 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@@ -5,7 +5,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.util.PullRequestConstants;@@ -21,7 +20,7 @@ public class TitleCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<String> attribute = root.get(PullRequestConstants.ATTR_TITLE);return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");}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 4e517f1255..16cda3671e 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@@ -7,7 +7,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -25,7 +24,7 @@ public class ToBeReviewedByCriteria extends PullRequestCriteria {}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);@@ -49,7 +48,8 @@ public class ToBeReviewedByCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeReviewedBy) + " " + PullRequestQuery.quote(value.getName());+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeReviewedBy)+ + " " + PullRequestQuery.quote(value.getName());}}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 65ecda9041..3a13b02c29 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,7 +7,6 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;@@ -19,7 +18,7 @@ public class ToBeReviewedByMeCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);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 3e55cc66d7..d2625a025e 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@@ -8,9 +8,8 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Build;-import io.onedev.server.model.PullRequestBuild;-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.util.PullRequestConstants;@@ -19,7 +18,7 @@ public class ToBeVerifiedByBuildsCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root.join(PullRequestConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT).join(PullRequestBuild.ATTR_BUILD, JoinType.INNER);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 9c1be6d76a..a558332fb5 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@@ -7,9 +7,9 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;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.EntityQuery;import io.onedev.server.util.PullRequestConstants;public class UpdateDateCriteria extends PullRequestCriteria {@@ -18,31 +18,31 @@ public class UpdateDateCriteria extends PullRequestCriteria {private final int operator;- private final Date value;+ private final String value;- private final String rawValue;+ private final Date date;- public UpdateDateCriteria(Date value, String rawValue, int operator) {+ public UpdateDateCriteria(String value, int operator) {this.operator = operator;this.value = value;- this.rawValue = rawValue;+ date = EntityQuery.getDateValue(value);}@Override- public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<Date> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_UPDATE_DATE);if (operator == PullRequestQueryLexer.IsBefore)- return builder.lessThan(attribute, value);+ return builder.lessThan(attribute, date);else- return builder.greaterThan(attribute, value);+ return builder.greaterThan(attribute, date);}@Overridepublic boolean matches(PullRequest request, User user) {if (operator == PullRequestQueryLexer.IsBefore)- return request.getUpdateDate().before(value);+ return request.getUpdateDate().before(date);else- return request.getUpdateDate().after(value);+ return request.getUpdateDate().after(date);}@Override@@ -52,7 +52,8 @@ public class UpdateDateCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_UPDATE_DATE) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(rawValue);+ return PullRequestQuery.quote(PullRequestConstants.FIELD_UPDATE_DATE) + " "+ + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.javaindex a981b102e6..001b06467b 100644--- a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java@@ -6,6 +6,7 @@ import java.util.HashSet;import java.util.Iterator;import java.util.concurrent.Callable;+import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;@@ -25,8 +26,10 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.MembershipManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Group;@@ -37,10 +40,15 @@ import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.administration.authenticator.Authenticated;import io.onedev.server.model.support.administration.authenticator.Authenticator;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.persistence.TransactionManager;+import io.onedev.server.security.permission.AccessBuildLog;import io.onedev.server.security.permission.CreateProjects;+import io.onedev.server.security.permission.EditIssueField;+import io.onedev.server.security.permission.JobPermission;import io.onedev.server.security.permission.ManageProject;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.UserAdministration;@@ -57,12 +65,14 @@ public class OneAuthorizingRealm extends AuthorizingRealm {private final GroupManager groupManager;+ private final ProjectManager projectManager;+private final TransactionManager transactionManager;@Injectpublic OneAuthorizingRealm(UserManager userManager, SettingManager configManager,MembershipManager membershipManager, GroupManager groupManager,- TransactionManager transactionManager) {+ ProjectManager projectManager, TransactionManager transactionManager) {PasswordMatcher passwordMatcher = new PasswordMatcher();passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));setCredentialsMatcher(passwordMatcher);@@ -71,6 +81,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {this.configManager = configManager;this.membershipManager = membershipManager;this.groupManager = groupManager;+ this.projectManager = projectManager;this.transactionManager = transactionManager;}@@ -90,11 +101,21 @@ public class OneAuthorizingRealm extends AuthorizingRealm {return new HashSet<>();}- private Collection<Permission> getGroupPermissions(Group group) {+ private Collection<Permission> getGroupPermissions(Group group, @Nullable User user) {Collection<Permission> permissions = new ArrayList<>();- if (group.isAdministrator())- permissions.add(new SystemAdministration());- if (group.isCreateProjects())+ if (group.isAdministrator()) {+ if (user != null) {+ permissions.add(new SystemAdministration());+ } else {+ for (Project project: projectManager.query()) {+ permissions.add(new ProjectPermission(project, new ReadCode()));+ for (FieldSpec field: OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpecs())+ permissions.add(new ProjectPermission(project, new EditIssueField(field.getName())));+ permissions.add(new ProjectPermission(project, new JobPermission("*", new AccessBuildLog())));+ }+ }+ }+ if (user != null && group.isCreateProjects())permissions.add(new CreateProjects());for (GroupAuthorization authorization: group.getProjectAuthorizations())permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));@@ -110,13 +131,14 @@ public class OneAuthorizingRealm extends AuthorizingRealm {Long userId = (Long) principals.getPrimaryPrincipal();Collection<Permission> permissions = new ArrayList<>();+ User user = null;if (userId != 0L) {- User user = userManager.load(userId);+ user = userManager.load(userId);if (user.isRoot())permissions.add(new SystemAdministration());permissions.add(new UserAdministration(user));for (Group group: user.getGroups())- permissions.addAll(getGroupPermissions(group));+ permissions.addAll(getGroupPermissions(group, user));for (UserAuthorization authorization: user.getProjectAuthorizations())permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));for (Project project: user.getProjects())@@ -124,7 +146,7 @@ public class OneAuthorizingRealm extends AuthorizingRealm {}Group group = groupManager.findAnonymous();if (group != null)- permissions.addAll(getGroupPermissions(group));+ permissions.addAll(getGroupPermissions(group, user));return permissions;}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ReadCode.java b/server-core/src/main/java/io/onedev/server/security/permission/ReadCode.javaindex 5d46a4ded5..00d43a25a6 100644--- a/server-core/src/main/java/io/onedev/server/security/permission/ReadCode.java+++ b/server-core/src/main/java/io/onedev/server/security/permission/ReadCode.java@@ -6,7 +6,7 @@ public class ReadCode implements Permission {@Overridepublic boolean implies(Permission p) {- return p instanceof ReadCode;+ return p instanceof ReadCode || new AccessProject().implies(p);}}diff --git a/server-core/src/main/java/io/onedev/server/util/CodeCommentConstants.java b/server-core/src/main/java/io/onedev/server/util/CodeCommentConstants.javaindex ca4c808f59..f833b949e3 100644--- a/server-core/src/main/java/io/onedev/server/util/CodeCommentConstants.java+++ b/server-core/src/main/java/io/onedev/server/util/CodeCommentConstants.java@@ -8,6 +8,8 @@ import com.google.common.collect.Lists;public class CodeCommentConstants {+ public static final String ATTR_PROJECT = "project";+public static final String FIELD_CONTENT = "Content";public static final String ATTR_CONTENT = "content";diff --git a/server-core/src/main/java/io/onedev/server/model/support/ProjectAndBranch.java b/server-core/src/main/java/io/onedev/server/util/ProjectAndBranch.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/model/support/ProjectAndBranch.javarename to server-core/src/main/java/io/onedev/server/util/ProjectAndBranch.javaindex bede1eac64..6d4cef9603 100644--- a/server-core/src/main/java/io/onedev/server/model/support/ProjectAndBranch.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectAndBranch.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support;+package io.onedev.server.util;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java b/server-core/src/main/java/io/onedev/server/util/ProjectAndRevision.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.javarename to server-core/src/main/java/io/onedev/server/util/ProjectAndRevision.javaindex bc3069361e..699a4a0c51 100644--- a/server-core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectAndRevision.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support;+package io.onedev.server.util;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectAwareCommitId.java b/server-core/src/main/java/io/onedev/server/util/ProjectAwareCommitId.javanew file mode 100644index 0000000000..13f8acf57a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/ProjectAwareCommitId.java@@ -0,0 +1,43 @@+package io.onedev.server.util;++import java.io.Serializable;++import javax.annotation.Nullable;++import org.eclipse.jgit.lib.ObjectId;++import io.onedev.server.model.Project;++public class ProjectAwareCommitId implements Serializable {++ private static final long serialVersionUID = 1L;++ private final Project project;++ private final ObjectId commitId;++ public ProjectAwareCommitId(Project project, ObjectId commitId) {+ this.project = project;+ this.commitId = commitId;+ }++ public Project getProject() {+ return project;+ }++ public ObjectId getCommitId() {+ return commitId;+ }++ @Nullable+ public static ProjectAwareCommitId from(String revisionFQN) {+ ProjectAwareRevision revision = ProjectAwareRevision.from(revisionFQN);+ if (revision != null) {+ Project project = revision.getProject();+ return new ProjectAwareCommitId(project, project.getObjectId(revision.getRevision(), false));+ } else {+ return null;+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectAwareRevision.java b/server-core/src/main/java/io/onedev/server/util/ProjectAwareRevision.javanew file mode 100644index 0000000000..ddcae58a6a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/ProjectAwareRevision.java@@ -0,0 +1,44 @@+package io.onedev.server.util;++import java.io.Serializable;++import javax.annotation.Nullable;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;++public class ProjectAwareRevision implements Serializable {++ private static final long serialVersionUID = 1L;++ private final Project project;++ private final String revision;++ public ProjectAwareRevision(Project project, String revision) {+ this.project = project;+ this.revision = revision;+ }++ public Project getProject() {+ return project;+ }++ public String getRevision() {+ return revision;+ }++ @Nullable+ public static ProjectAwareRevision from(String revisionFQN) {+ String projectName = StringUtils.substringBefore(revisionFQN, ":");+ String revision = StringUtils.substringAfter(revisionFQN, ":");+ Project project = OneDev.getInstance(ProjectManager.class).find(projectName);+ if (project != null)+ return new ProjectAwareRevision(project, revision);+ else+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/BuildFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/BuildFacade.javaindex d3217124ae..9665ffec15 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/BuildFacade.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/BuildFacade.java@@ -8,13 +8,10 @@ public class BuildFacade extends EntityFacade {private final String commitHash;- private final String jobName;-- public BuildFacade(Long buildId, Long projectId, String commitHash, String jobName) {+ public BuildFacade(Long buildId, Long projectId, String commitHash) {super(buildId);this.projectId = projectId;this.commitHash = commitHash;- this.jobName = jobName;}public Long getProjectId() {@@ -25,8 +22,4 @@ public class BuildFacade extends EntityFacade {return commitHash;}- public String getJobName() {- return jobName;- }-}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 4384575d44..817c5136b2 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@@ -101,7 +101,10 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);return !suggestions.isEmpty()? suggestions: null;} else if (fieldName.equals(BuildConstants.FIELD_JOB)) {- return SuggestionUtils.suggestJobs(projectModel.getObject(), matchWith);+ if (project != null)+ return SuggestionUtils.suggestJobs(project, matchWith);+ else+ return null;} else if (fieldName.equals(BuildConstants.FIELD_NUMBER)) {return SuggestionUtils.suggestBuilds(project, matchWith);} else {@@ -136,14 +139,6 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {|| suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.CancelledByMe)))) {return null;}- if (getProject() == null- && (suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.AssociatedWithPullRequest))- || suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.DependenciesOf))- || suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.DependsOn))- || suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.FixedIssue))- || suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.RequiredByPullRequest)))) {- return null;- }parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {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 4e0aeed5b8..3781a89b6c 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@@ -4,10 +4,7 @@ import static io.onedev.server.search.entity.EntityQuery.getValue;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.FixedBetween;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInBuild;import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsMe;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.Mine;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.util.IssueConstants.FIELD_COMMENT;@@ -114,15 +111,13 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {} else if ("revisionValue".equals(spec.getLabel())) {String revisionType = terminalExpect.getState().findMatchedElementsByLabel("revisionType", true).iterator().next().getMatchedText();- if (project != null) {- switch (revisionType) {- case "branch":- return SuggestionUtils.suggestBranches(project, matchWith);- case "tag":- return SuggestionUtils.suggestTags(project, matchWith);- case "build":- return SuggestionUtils.suggestBuilds(project, matchWith);- }+ switch (revisionType) {+ case "branch":+ return SuggestionUtils.suggestBranches(project, matchWith);+ case "tag":+ return SuggestionUtils.suggestTags(project, matchWith);+ case "build":+ return SuggestionUtils.suggestBuilds(project, matchWith);}} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);@@ -133,7 +128,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {if (fieldElements.isEmpty()) {if (operator == SubmittedBy)return SuggestionUtils.suggestUsers(matchWith);- else if (project != null)+ elsereturn SuggestionUtils.suggestBuilds(project, matchWith);} else {String fieldName = getValue(fieldElements.get(0).getMatchedText());@@ -148,14 +143,11 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {} else if (fieldSpec instanceof UserChoiceField) {return SuggestionUtils.suggestUsers(matchWith);} else if (fieldSpec instanceof IssueChoiceField) {- if (project != null)- return SuggestionUtils.suggestIssues(project, matchWith);+ return SuggestionUtils.suggestIssues(project, matchWith);} else if (fieldSpec instanceof BuildChoiceField) {- if (project != null)- return SuggestionUtils.suggestBuilds(project, matchWith);+ return SuggestionUtils.suggestBuilds(project, matchWith);} else if (fieldSpec instanceof PullRequestChoiceField) {- if (project != null)- return SuggestionUtils.suggestPullRequests(project, matchWith);+ return SuggestionUtils.suggestPullRequests(project, matchWith);} else if (fieldSpec instanceof BooleanField) {return SuggestionUtils.suggest(Lists.newArrayList("true", "false"), matchWith);} else if (fieldSpec instanceof GroupChoiceField) {@@ -173,10 +165,10 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {ComponentContext.pop();}} else if (fieldName.equals(FIELD_MILESTONE)) {- if (project != null) {- List<String> candidates = project.getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());- return SuggestionUtils.suggest(candidates, matchWith);- }+ if (project != null)+ return SuggestionUtils.suggestMilestones(project, matchWith);+ else+ return null;} else if (fieldName.equals(FIELD_TITLE) || fieldName.equals(FIELD_DESCRIPTION)|| fieldName.equals(FIELD_COMMENT) || fieldName.equals(FIELD_VOTE_COUNT)|| fieldName.equals(FIELD_COMMENT_COUNT) || fieldName.equals(FIELD_NUMBER)@@ -203,25 +195,12 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {- if (suggestedLiteral.equals(getRuleName(Mine))) {- if (SecurityUtils.getUser() != null)- return Optional.of("issues relevant to me");- else- return null;- }-if (SecurityUtils.getUser() == null&& (suggestedLiteral.equals(getRuleName(IsMe))|| suggestedLiteral.equals(getRuleName(SubmittedByMe)))) {return null;}- if (getProject() == null- && (suggestedLiteral.equals(getRuleName(FixedBetween))- || suggestedLiteral.equals(getRuleName(FixedInBuild)))) {- 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/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex 9185bf792f..475729230c 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,13 +1,11 @@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.IncludesCommit;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IncludesIssue;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.ToBeReviewedByMe;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.RequestedForChangesByMe;import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.ApprovedByMe;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.SubmittedByMe;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 java.util.ArrayList;import java.util.List;@@ -97,7 +95,10 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {return SuggestionUtils.suggestProjects(matchWith);} else if (fieldName.equals(PullRequestConstants.FIELD_TARGET_BRANCH)|| fieldName.equals(PullRequestConstants.FIELD_SOURCE_BRANCH)) {- return SuggestionUtils.suggestBranches(project, matchWith);+ if (project != null)+ return SuggestionUtils.suggestBranches(project, matchWith);+ else+ return null;} else if (fieldName.equals(PullRequestConstants.FIELD_MERGE_STRATEGY)) {List<String> candidates = new ArrayList<>();for (MergeStrategy strategy: MergeStrategy.values())@@ -138,12 +139,6 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {|| suggestedLiteral.equals(getRuleName(DiscardedByMe)))) {return null;}- if (getProject() == null- && (suggestedLiteral.equals(getRuleName(IncludesCommit))- || suggestedLiteral.equals(getRuleName(IncludesIssue)))) {- 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/branch/BranchLink.java b/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.javaindex fcc3b0933d..f3c4903d95 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java@@ -10,7 +10,7 @@ import org.eclipse.jgit.lib.FileMode;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.ProjectAndBranch;+import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.project.ProjectPage;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 d8e322e748..db1e4aa79d 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@@ -80,6 +80,8 @@ public abstract class BuildListPanel extends Panel {private final String query;+ private final Integer expectedCount;+private IModel<BuildQuery> parsedQueryModel = new LoadableDetachableModel<BuildQuery>() {@Override@@ -105,9 +107,10 @@ public abstract class BuildListPanel extends Panel {private DataTable<Build, Void> buildsTable;- public BuildListPanel(String id, @Nullable String query) {+ public BuildListPanel(String id, @Nullable String query, @Nullable Integer expectedCount) {super(id);this.query = query;+ this.expectedCount = expectedCount;}private BuildManager getBuildManager() {@@ -278,6 +281,9 @@ public abstract class BuildListPanel extends Panel {};+ if (expectedCount != null && expectedCount != dataProvider.size())+ warn("Some builds might be hidden due to permission policy");+body.add(new NotificationPanel("feedback", this));List<IColumn<Build, Void>> columns = new ArrayList<>();@@ -417,7 +423,7 @@ public abstract class BuildListPanel extends Panel {@Overrideprotected Project getProject() {- return BuildListPanel.this.getProject();+ return rowModel.getObject().getProject();}};diff --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 8d8b02ee22..ebf2b7dd64 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@@ -44,7 +44,7 @@ import io.onedev.server.web.component.entity.nav.EntityNavPanel;import io.onedev.server.web.component.job.JobDefLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.user.ident.UserIdentPanel;-import io.onedev.server.web.page.project.builds.ProjectBuildsPage;+import io.onedev.server.web.page.build.BuildListPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.util.QueryPositionSupport;@@ -248,24 +248,19 @@ public abstract class BuildSidePanel extends Panel {WebMarkupContainer dependencesContainer = new WebMarkupContainer("dependences");add(dependencesContainer);- Link<Void> dependentsLink = new BookmarkablePageLink<Void>("dependents", ProjectBuildsPage.class,- ProjectBuildsPage.paramsOf(getProject(), "depends on " + BuildQuery.quote("#" + getBuild().getNumber()), 0));+ String query = "depends on " + BuildQuery.quote(getBuild().getProject().getName() + "#" + getBuild().getNumber());+ Link<Void> dependentsLink = new BookmarkablePageLink<Void>("dependents", BuildListPage.class,+ BuildListPage.paramsOf(query, getBuild().getDependents().size(), 0));dependentsLink.setVisible(!getBuild().getDependents().isEmpty());-- if (getBuild().getDependents().size() > 1)- dependentsLink.add(new Label("label", getBuild().getDependents().size() + " builds"));- else- dependentsLink.add(new Label("label", getBuild().getDependents().size() + " build"));+ dependentsLink.add(new Label("label", getBuild().getDependents().size() + " build(s)"));dependencesContainer.add(dependentsLink);- Link<Void> dependenciesLink = new BookmarkablePageLink<Void>("dependencies", ProjectBuildsPage.class,- ProjectBuildsPage.paramsOf(getProject(), "dependencies of " + BuildQuery.quote("#" + getBuild().getNumber()), 0));+ query = "dependencies of " + BuildQuery.quote(getBuild().getProject().getName() + "#" + getBuild().getNumber());+ Link<Void> dependenciesLink = new BookmarkablePageLink<Void>("dependencies", BuildListPage.class,+ BuildListPage.paramsOf(query, getBuild().getDependencies().size(), 0));dependenciesLink.setVisible(!getBuild().getDependencies().isEmpty());- if (getBuild().getDependencies().size() > 1)- dependenciesLink.add(new Label("label", getBuild().getDependencies().size() + " builds"));- else- dependenciesLink.add(new Label("label", getBuild().getDependencies().size() + " build"));+ dependenciesLink.add(new Label("label", getBuild().getDependencies().size() + " build(s)"));dependencesContainer.add(dependenciesLink);WebMarkupContainer comma = new WebMarkupContainer("comma");diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 35a50d6cec..35bf691329 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@@ -59,12 +59,12 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.model.Project;-import io.onedev.server.model.support.ProjectAndRevision;import io.onedev.server.search.commit.CommitCriteria;import io.onedev.server.search.commit.CommitQuery;import io.onedev.server.search.commit.MessageCriteria;import io.onedev.server.search.commit.PathCriteria;import io.onedev.server.util.Constants;+import io.onedev.server.util.ProjectAndRevision;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.behavior.CommitQueryBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex d8ac5be058..4fc91314bf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -78,8 +78,8 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.MarkPos;-import io.onedev.server.model.support.ProjectAndRevision;import io.onedev.server.search.code.IndexManager;+import io.onedev.server.util.ProjectAndRevision;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.util.diff.WhitespaceOption;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex 994a8b6be0..c65314fb7f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -67,10 +67,12 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {UserIdent userIdent = UserIdent.of(OneDev.getInstance(UserManager.class).findByName(value), value);item.add(new UserIdentPanel("value", userIdent, Mode.AVATAR_AND_NAME));} else if (getField().getType().equals(FieldSpec.ISSUE)) {- Issue issue = OneDev.getInstance(IssueManager.class).find(getIssue().getProject(), Long.valueOf(value));+ Issue issue = OneDev.getInstance(IssueManager.class)+ .find(getIssue().getProject(), Long.valueOf(value));if (issue != null) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);- Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));+ Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class,+ IssueActivitiesPage.paramsOf(issue, null));link.add(new Label("label", "#" + issue.getNumber()));linkFrag.add(link);item.add(linkFrag);@@ -78,7 +80,8 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {item.add(new Label("value", "#" + value));}} else if (getField().getType().equals(FieldSpec.BUILD)) {- Build build = OneDev.getInstance(BuildManager.class).get(Long.valueOf(value));+ Build build = OneDev.getInstance(BuildManager.class)+ .find(getIssue().getProject(), Long.valueOf(value));if (build != null) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);Link<Void> link = new BookmarkablePageLink<Void>("link",@@ -90,10 +93,12 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {item.add(new Label("value", "#" + value));}} else if (getField().getType().equals(FieldSpec.PULLREQUEST)) {- PullRequest request = OneDev.getInstance(PullRequestManager.class).find(getIssue().getProject(), Long.valueOf(value));+ PullRequest request = OneDev.getInstance(PullRequestManager.class)+ .find(getIssue().getProject(), Long.valueOf(value));if (request != null) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);- Link<Void> link = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(request, null));+ Link<Void> link = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class,+ PullRequestActivitiesPage.paramsOf(request, null));link.add(new Label("label", "#" + request.getNumber()));linkFrag.add(link);item.add(linkFrag);diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.javaindex 6e57b980f3..fc26dbbb5e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java@@ -1,7 +1,5 @@package io.onedev.server.web.component.job;-import javax.annotation.Nullable;-import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -42,19 +40,14 @@ public abstract class JobDefLink extends BookmarkablePageLink<Void> {tag.setName("span");}- @Nullableprotected abstract Project getProject();@Overridepublic PageParameters getPageParameters() {- if (getProject() != null) {- ProjectBlobPage.State state = new ProjectBlobPage.State();- state.blobIdent = new BlobIdent(commitId.name(), CISpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits());- state.position = CISpecRendererProvider.getPosition(Job.SELECTION_PREFIX + jobName);- return ProjectBlobPage.paramsOf(getProject(), state);- } else {- return super.getPageParameters();- }+ ProjectBlobPage.State state = new ProjectBlobPage.State();+ state.blobIdent = new BlobIdent(commitId.name(), CISpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits());+ state.position = CISpecRendererProvider.getPosition(Job.SELECTION_PREFIX + jobName);+ return ProjectBlobPage.paramsOf(getProject(), state);}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.javaindex 68c530a592..5bd2e3e9c3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java@@ -55,7 +55,8 @@ public class PullRequestChoiceProvider extends ChoiceProvider<PullRequest> {public void query(String term, int page, Response<PullRequest> response) {int count = (page+1) * WebConstants.PAGE_SIZE;Project project = projectModel.getObject();- List<PullRequest> requests = OneDev.getInstance(PullRequestManager.class).query(project, term, count);+ List<PullRequest> requests = OneDev.getInstance(PullRequestManager.class)+ .query(project, term, count);new ResponseFiller<>(response).fill(requests, page, WebConstants.PAGE_SIZE);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.javaindex e950da87ab..c83386c97a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java@@ -11,7 +11,7 @@ import org.unbescape.html.HtmlEscape;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;-import io.onedev.server.model.support.ProjectAndRevision;+import io.onedev.server.util.ProjectAndRevision;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.modal.ModalPanel;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 d44c7a5a65..0e644dbd56 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@@ -38,8 +38,12 @@ public class BuildListPage extends LayoutPage {private static final String PARAM_QUERY = "query";+ private static final String PARAM_EXPECTED_COUNT = "expectedCount";+private String query;+ private Integer expectedCount;+public BuildListPage(PageParameters params) {super(params);query = params.get(PARAM_QUERY).toOptionalString();@@ -62,6 +66,7 @@ public class BuildListPage extends LayoutPage {}}}+ expectedCount = params.get(PARAM_EXPECTED_COUNT).toOptionalInteger();}protected BuildSetting getBuildSetting() {@@ -88,7 +93,7 @@ public class BuildListPage extends LayoutPage {@Overrideprotected Link<Void> newQueryLink(String componentId, NamedBuildQuery namedQuery) {return new BookmarkablePageLink<Void>(componentId, BuildListPage.class,- BuildListPage.paramsOf(namedQuery.getQuery(), 0));+ BuildListPage.paramsOf(namedQuery.getQuery(), null, 0));}@Override@@ -126,7 +131,7 @@ public class BuildListPage extends LayoutPage {@Overridepublic PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(query, 0);+ PageParameters params = paramsOf(query, null, 0);params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@@ -138,7 +143,7 @@ public class BuildListPage extends LayoutPage {};- add(new BuildListPanel("main", query) {+ add(new BuildListPanel("main", query, expectedCount) {@Overrideprotected PagingHistorySupport getPagingHistorySupport() {@@ -147,7 +152,7 @@ public class BuildListPage extends LayoutPage {@Overrideprotected void onQueryUpdated(AjaxRequestTarget target, String query) {- setResponsePage(BuildListPage.class, paramsOf(query, 0));+ setResponsePage(BuildListPage.class, paramsOf(query, null, 0));}@Override@@ -221,10 +226,13 @@ public class BuildListPage extends LayoutPage {}- public static PageParameters paramsOf(@Nullable String query, int page) {+ public static PageParameters paramsOf(@Nullable String query,+ @Nullable Integer expectedCount, int page) {PageParameters params = new PageParameters();if (query != null)params.add(PARAM_QUERY, query);+ if (expectedCount != null)+ params.add(PARAM_EXPECTED_COUNT, expectedCount);if (page != 0)params.add(PARAM_CURRENT_PAGE, page);return params;diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 5c3de3dbfe..3457192bef 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -26,7 +26,6 @@<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Administration <i class="fa fa-angle-down"></i></a><ul class="dropdown-menu"><li wicket:id="userManagement"><a wicket:id="link"><i class="fa fa-fw fa-user"></i> User Management</a></li>- <li role="separator" class="divider"></li><li wicket:id="roleManagement"><a wicket:id="link"><i class="fa fa-fw fa-vcard-o"></i> Role Management</a></li><li wicket:id="groupManagement"><a wicket:id="link"><i class="fa fa-fw fa-group"></i> Group Management</a></li><li wicket:id="securitySetting"><a wicket:id="link"><i class="fa fa-fw fa-lock"></i> Security Setting</a></li>diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex f295294bed..816581369c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -99,7 +99,7 @@ public abstract class LayoutPage extends BasePage {WebMarkupContainer buildsContainer = new WebMarkupContainer("navBuilds");buildsContainer.add(new ViewStateAwarePageLink<Void>("link", BuildListPage.class,- BuildListPage.paramsOf("", 0)));+ BuildListPage.paramsOf("", null, 0)));if (getPage() instanceof BuildListPage)buildsContainer.add(AttributeAppender.append("class", "active"));add(buildsContainer);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex 4c3a4df583..d09b2d41c5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -77,10 +77,10 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.MarkPos;-import io.onedev.server.model.support.ProjectAndRevision;import io.onedev.server.search.code.SearchManager;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.util.DateUtils;+import io.onedev.server.util.ProjectAndRevision;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 9289d2315d..16b18a8fe0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -66,10 +66,10 @@ import io.onedev.server.git.RefInfo;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.BranchProtection;-import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.search.entity.pullrequest.OpenCriteria;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;+import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.OnTypingDoneBehavior;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 ee7ec52a80..54940b6d59 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@@ -142,7 +142,7 @@ public class ProjectBuildsPage extends ProjectPage {};- add(new BuildListPanel("main", query) {+ add(new BuildListPanel("main", query, null) {@Overrideprotected PagingHistorySupport getPagingHistorySupport() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 60e8102475..5170cd553a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -36,12 +36,12 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.MarkPos;-import io.onedev.server.model.support.ProjectAndBranch;-import io.onedev.server.model.support.ProjectAndRevision;import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.search.commit.CommitQuery;import io.onedev.server.search.commit.Revision;import io.onedev.server.search.commit.RevisionCriteria;+import io.onedev.server.util.ProjectAndBranch;+import io.onedev.server.util.ProjectAndRevision;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.component.commit.list.CommitListPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.javaindex 5623818470..3386222f31 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java@@ -155,9 +155,7 @@ public abstract class ProjectInfoPanel extends Panel {};}- }.setVisible(SecurityUtils.canCreateProjects()- && SecurityUtils.getUser() != null- && SecurityUtils.canReadCode(getProject())));+ }.setVisible(SecurityUtils.canCreateProjects() && SecurityUtils.canReadCode(getProject())));}private Project getProject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 531300e126..b63af4934e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -137,7 +137,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component content = new BuildListPanel(TAB_CONTENT_ID, null) {+ Component content = new BuildListPanel(TAB_CONTENT_ID, null, null) {@Overrideprotected BuildQuery getBaseQuery() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.javaindex d41fceff0f..afdc10c87a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.java@@ -33,7 +33,7 @@ public class FixingBuildsPage extends IssueDetailPage {protected void onInitialize() {super.onInitialize();- add(new BuildListPanel("builds", query) {+ add(new BuildListPanel("builds", query, null) {@Overrideprotected BuildQuery getBaseQuery() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 047bb59404..417a02f7c0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -51,7 +51,6 @@ import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.User;import io.onedev.server.model.support.MarkPos;-import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;@@ -60,6 +59,7 @@ import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.search.commit.CommitQuery;import io.onedev.server.search.commit.Revision;import io.onedev.server.search.commit.RevisionCriteria;+import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;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 b7032e0219..3dd98dff5a 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@@ -94,12 +94,12 @@ import io.onedev.server.model.PullRequestBuild;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.PullRequestWatch;import io.onedev.server.model.support.EntityWatch;-import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.util.DateUtils;+import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;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 54d7538048..6603e76cf4 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@@ -2,6 +2,7 @@ package io.onedev.server.web.util;import java.io.File;import java.util.ArrayList;+import java.util.Collection;import java.util.HashMap;import java.util.HashSet;import java.util.LinkedHashMap;@@ -12,6 +13,7 @@ import java.util.concurrent.Callable;import javax.annotation.Nullable;+import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Preconditions;@@ -42,6 +44,7 @@ import io.onedev.server.git.RefInfo;import io.onedev.server.model.Build;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;+import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;@@ -65,17 +68,29 @@ public class SuggestionUtils {return suggestions;}- public static List<InputSuggestion> suggestBranches(Project project, String matchWith) {- matchWith = matchWith.toLowerCase();- int numSuggestions = 0;- List<InputSuggestion> suggestions = new ArrayList<>();- for (RefInfo ref: project.getBranches()) {- String branch = GitUtils.ref2branch(ref.getRef().getName());- int index = branch.toLowerCase().indexOf(matchWith);- if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS)- suggestions.add(new InputSuggestion(branch, new LinearRange(index, index+matchWith.length())));- }- return suggestions;+ public static List<InputSuggestion> suggestBranches(@Nullable Project project, String matchWith) {+ return suggest(project, matchWith, new ProjectScopedSuggester() {++ @Override+ public void fillSuggestions(List<InputSuggestion> suggestions, Project project, User user,+ String matchWith, boolean prependProject) {+ int numSuggestions = 0;+ for (RefInfo ref: project.getBranches()) {+ String branch = GitUtils.ref2branch(ref.getRef().getName());+ LinearRange match = LinearRange.match(branch, matchWith, true, false, true);+ if (match != null && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {+ if (prependProject) {+ int length = project.getName().length() + 1;+ suggestions.add(new InputSuggestion(project.getName() + ":" + branch,+ null, new LinearRange(match.getFrom() + length, match.getTo() + length)));+ } else {+ suggestions.add(new InputSuggestion(branch, null, match));+ }+ }+ }+ }++ }, ":");}public static List<InputSuggestion> suggestProjects(String matchWith) {@@ -143,17 +158,29 @@ public class SuggestionUtils {return suggestions;}- public static List<InputSuggestion> suggestTags(Project project, String matchWith) {- matchWith = matchWith.toLowerCase();- int numSuggestions = 0;- List<InputSuggestion> suggestions = new ArrayList<>();- for (RefInfo ref: project.getTags()) {- String tag = GitUtils.ref2tag(ref.getRef().getName());- int index = tag.toLowerCase().indexOf(matchWith);- if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS)- suggestions.add(new InputSuggestion(tag, new LinearRange(index, index+matchWith.length())));- }- return suggestions;+ public static List<InputSuggestion> suggestTags(@Nullable Project project, String matchWith) {+ return suggest(project, matchWith, new ProjectScopedSuggester() {++ @Override+ public void fillSuggestions(List<InputSuggestion> suggestions, Project project, User user,+ String matchWith, boolean prependProject) {+ int numSuggestions = 0;+ for (RefInfo ref: project.getTags()) {+ String tag = GitUtils.ref2tag(ref.getRef().getName());+ LinearRange match = LinearRange.match(tag, matchWith, true, false, true);+ if (match != null && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {+ if (prependProject) {+ int length = project.getName().length() + 1;+ suggestions.add(new InputSuggestion(project.getName() + ":" + tag,+ null, new LinearRange(match.getFrom() + length, match.getTo() + length)));+ } else {+ suggestions.add(new InputSuggestion(tag, null, match));+ }+ }+ }+ }++ }, ":");}public static List<InputSuggestion> suggestUsers(String matchWith) {@@ -173,41 +200,68 @@ public class SuggestionUtils {return suggestions;}- public static List<InputSuggestion> suggestIssues(Project project, String matchWith) {- matchWith = matchWith.toLowerCase();- List<InputSuggestion> suggestions = new ArrayList<>();- for (Issue issue: OneDev.getInstance(IssueManager.class).query(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS))- suggestions.add(new InputSuggestion("#" + issue.getNumber(), issue.getTitle(), null));- return suggestions;+ public static List<InputSuggestion> suggestIssues(@Nullable Project project, String matchWith) {+ return suggest(project, matchWith, new ProjectScopedSuggester() {++ @Override+ public void fillSuggestions(List<InputSuggestion> suggestions, Project project,+ @Nullable User user, String matchWith, boolean prependProject) {+ for (Issue issue: OneDev.getInstance(IssueManager.class).query(+ project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS)) {+ if (prependProject)+ suggestions.add(new InputSuggestion(project.getName() + "#" + issue.getNumber(), issue.getTitle(), null));+ else+ suggestions.add(new InputSuggestion("#" + issue.getNumber(), issue.getTitle(), null));+ }+ }++ }, "#");}- public static List<InputSuggestion> suggestPullRequests(Project project, String matchWith) {- matchWith = matchWith.toLowerCase();- List<InputSuggestion> suggestions = new ArrayList<>();- for (PullRequest request: OneDev.getInstance(PullRequestManager.class).query(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS))- suggestions.add(new InputSuggestion("#" + request.getNumber(), request.getTitle(), null));- return suggestions;+ public static List<InputSuggestion> suggestPullRequests(@Nullable Project project, String matchWith) {+ return suggest(project, matchWith, new ProjectScopedSuggester() {++ @Override+ public void fillSuggestions(List<InputSuggestion> suggestions, Project project,+ @Nullable User user, String matchWith, boolean prependProject) {+ for (PullRequest request: OneDev.getInstance(PullRequestManager.class).query(+ project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS)) {+ if (prependProject)+ suggestions.add(new InputSuggestion(project.getName() + "#" + request.getNumber(), request.getTitle(), null));+ else+ suggestions.add(new InputSuggestion("#" + request.getNumber(), request.getTitle(), null));+ }+ }++ }, "#");}- public static List<InputSuggestion> suggestBuilds(Project project, String matchWith) {- matchWith = matchWith.toLowerCase();- if (matchWith.startsWith("#"))- matchWith = matchWith.substring(1);- List<InputSuggestion> suggestions = new ArrayList<>();- for (Build build: OneDev.getInstance(BuildManager.class).query(project, SecurityUtils.getUser(), matchWith, InputAssistBehavior.MAX_SUGGESTIONS)) {- InputSuggestion suggestion;-- String description;- if (build.getVersion() != null)- description = build.getVersion() + " : " + build.getJobName();- else- description = build.getJobName();+ public static List<InputSuggestion> suggestBuilds(@Nullable Project project, String matchWith) {+ return suggest(project, matchWith, new ProjectScopedSuggester() {- suggestion = new InputSuggestion("#" + build.getNumber(), description, null);+ @Override+ public void fillSuggestions(List<InputSuggestion> suggestions, Project project,+ @Nullable User user, String matchWith, boolean prependProject) {+ for (Build build: OneDev.getInstance(BuildManager.class).query(+ project, user, matchWith, InputAssistBehavior.MAX_SUGGESTIONS)) {+ InputSuggestion suggestion;++ String description;+ if (build.getVersion() != null)+ description = build.getVersion() + " : " + build.getJobName();+ else+ description = build.getJobName();++ if (prependProject)+ suggestion = new InputSuggestion(build.getProject().getName() + "#" + build.getNumber(), description, null);+ else+ suggestion = new InputSuggestion("#" + build.getNumber(), description, null);++ suggestions.add(suggestion);+ }+ }- suggestions.add(suggestion);- }- return suggestions;+ }, "#");}public static List<InputSuggestion> suggestGroups(String matchWith) {@@ -227,17 +281,84 @@ public class SuggestionUtils {return suggestPaths(commitInfoManager.getFiles(project), matchWith);}- public static List<InputSuggestion> suggestJobs(Project project, String matchWith) {- matchWith = matchWith.toLowerCase();+ private static List<InputSuggestion> suggest(@Nullable Project project, String matchWith,+ ProjectScopedSuggester projectScopedSuggester, String scopeSeparator) {List<InputSuggestion> suggestions = new ArrayList<>();- for (String jobName: project.getJobNames()) {- LinearRange match = LinearRange.match(jobName, matchWith, true, false, true);- if (match != null)- suggestions.add(new InputSuggestion(jobName, null, match));- }++ User user = SecurityUtils.getUser();+ boolean prependProject = project == null;+ if (project == null) {+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);+ if (matchWith.contains(scopeSeparator)) {+ String projectName = StringUtils.substringBefore(matchWith, scopeSeparator);+ matchWith = StringUtils.substringAfter(matchWith, scopeSeparator);+ project = projectManager.find(projectName);+ } else {+ for (Project each: projectManager.getPermittedProjects(user, new AccessProject())) {+ LinearRange match = LinearRange.match(each.getName() + scopeSeparator,+ matchWith, true, false, true);+ if (match != null) {+ suggestions.add(new InputSuggestion(each.getName() + scopeSeparator,+ each.getName().length() + scopeSeparator.length(), "select project first", match));+ }+ }+ }+ }+ if (project != null)+ projectScopedSuggester.fillSuggestions(suggestions, project, user, matchWith, prependProject);+return suggestions;}+ public static List<InputSuggestion> suggestJobs(@Nullable Project project, String matchWith) {+ return suggest(project, matchWith, new ProjectScopedSuggester() {++ @Override+ public void fillSuggestions(List<InputSuggestion> suggestions, Project project,+ @Nullable User user, String matchWith, boolean prependProject) {+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);+ Collection<String> jobNames = buildManager.getAccessibleJobNames(project, user).get(project);+ for (String jobName: jobNames) {+ LinearRange match = LinearRange.match(jobName, matchWith, true, false, true);+ if (match != null) {+ if (prependProject) {+ int length = project.getName().length() + 1;+ suggestions.add(new InputSuggestion(project.getName() + ":" + jobName, null,+ new LinearRange(match.getFrom() + length, match.getTo() + length)));+ } else {+ suggestions.add(new InputSuggestion(jobName, null, match));+ }+ }+ }+ }++ }, ":");+ }++ public static List<InputSuggestion> suggestMilestones(@Nullable Project project, String matchWith) {+ return suggest(project, matchWith, new ProjectScopedSuggester() {++ @Override+ public void fillSuggestions(List<InputSuggestion> suggestions, Project project, User user,+ String matchWith, boolean prependProject) {+ for (Milestone milestone: project.getMilestones()) {+ LinearRange match = LinearRange.match(milestone.getName(), matchWith, true, false, true);+ if (match != null) {+ if (prependProject) {+ int length = project.getName().length() + 1;+ suggestions.add(new InputSuggestion(project.getName() + ":" + milestone.getName(),+ null, new LinearRange(match.getFrom() + length, match.getTo() + length)));+ } else {+ suggestions.add(new InputSuggestion(milestone.getName(), null, match));+ }+ }+ }+ }++ }, ":");++ }+public static List<InputSuggestion> suggestArtifacts(Build build, String matchWith) {return LockUtils.read(build.getArtifactsLockKey(), new Callable<List<InputSuggestion>>() {@@ -329,4 +450,11 @@ public class SuggestionUtils {return suggestions;}+ static interface ProjectScopedSuggester {++ void fillSuggestions(List<InputSuggestion> suggestions, Project project,+ @Nullable User user, String matchWith, boolean prependProject);++ }+}diff --git a/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java b/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.javaindex a399197f60..da2ea5b996 100644--- a/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java@@ -48,11 +48,11 @@ public class IssueQueryGrammarTest {assertEquals(1, suggestions.size());assertEquals("\"Date\" is before \"2018-09-01 2:30PM\":36", suggestions.get(0).toString());- suggestions = codeAssist.suggest(new InputStatus("mine", 4), "query");+ suggestions = codeAssist.suggest(new InputStatus("submitted by me", 15), "query");assertEquals(3, suggestions.size());- assertEquals("mine:4", suggestions.get(0).toString());- assertEquals("\"mine\" :7", suggestions.get(1).toString());- assertEquals("mine :5", suggestions.get(2).toString());+ assertEquals("submitted by me:15", suggestions.get(0).toString());+ assertEquals("\"submitted by me\" :18", suggestions.get(1).toString());+ assertEquals("submitted by me :16", suggestions.get(2).toString());}}