Skip to content

The Unified and Autonomous Development Platform

Fix issue #328 - Issue linking and subtasks

Robin Shen33a305b2223b
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.java
index 4cb0a2c210..4767602bf9 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
@@ -82,4 +82,5 @@ public interface IssueManager extends EntityManager<Issue> {
List<Issue> queryAfter(@Nullable Long afterIssueId, int count);
+ void test();
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/LinkSpecManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/LinkSpecManager.java
index a41fa1e872..89d452f6a6 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/LinkSpecManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/LinkSpecManager.java
@@ -1,5 +1,7 @@
package io.onedev.server.entitymanager;
+import java.util.List;
+
import javax.annotation.Nullable;
import io.onedev.server.model.LinkSpec;
@@ -9,5 +11,9 @@ public interface LinkSpecManager extends EntityManager<LinkSpec> {
@Nullable
LinkSpec find(String name);
+
+ List<LinkSpec> queryAndSort();
+ void updateOrders(List<LinkSpec> links);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
index 34d7a0a478..90b4947dc9 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
@@ -59,13 +59,13 @@ public interface ProjectManager extends EntityManager<Project> {
Collection<Project> getPermittedProjects(Permission permission);
- List<Project> query(EntityQuery<Project> projecQuery, int firstResult, int maxResults);
+ List<Project> query(EntityQuery<Project> query, int firstResult, int maxResults);
- int count(EntityCriteria<Project> projectCriteria);
+ int count(EntityCriteria<Project> criteria);
- Predicate getPathMatchPredicate(CriteriaBuilder builder, Path<Project> project, String pathPattern);
+ Predicate getPathMatchPredicate(CriteriaBuilder builder, Path<Project> jpaPath, String pathPattern);
- Predicate getTreePredicate(CriteriaBuilder builder, Path<Project> project, Project treeRoot);
+ Predicate getTreePredicate(CriteriaBuilder builder, Path<Project> jpaPath, Project project);
void move(Collection<Project> projects, @Nullable Project parent);
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.java
index c6b4a1ba02..dd280d0c02 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
@@ -21,6 +21,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
@@ -343,7 +344,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
return getSession().createQuery(query).list();
}
- private List<Predicate> getPredicates(Root<Build> root, CriteriaBuilder builder,
+ private List<Predicate> getPredicates(From<Build, Build> root, CriteriaBuilder builder,
Map<String, List<String>> params) {
List<Predicate> predicates = new ArrayList<>();
@@ -470,7 +471,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
buildDependenceManager.save(dependence);
}
- private Collection<Predicate> getPredicates(@Nullable Project project, Root<Build> root, CriteriaBuilder builder) {
+ private Collection<Predicate> getPredicates(@Nullable Project project, From<Build, Build> root, CriteriaBuilder builder) {
Collection<Predicate> predicates = new ArrayList<>();
jobNamesLock.readLock().lock();
@@ -527,7 +528,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
private Predicate[] getPredicates(@Nullable Project project,
@Nullable io.onedev.server.search.entity.EntityCriteria<Build> criteria,
- CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
+ CriteriaQuery<?> query, From<Build, Build> root, CriteriaBuilder builder) {
Collection<Predicate> predicates = getPredicates(project, root, builder);
if (criteria != null)
predicates.add(criteria.getPredicate(query, root, builder));
@@ -559,7 +560,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
return query.getResultList();
}
- private void applyOrders(Root<Build> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder builder,
+ private void applyOrders(From<Build, Build> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder builder,
EntityQuery<Build> buildQuery) {
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
for (EntitySort sort: buildQuery.getSorts()) {
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.java
index 6f54041fdb..cf1fa0cdb2 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
@@ -17,6 +17,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
@@ -249,7 +250,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> im
private Predicate[] getPredicates(Project project,
@Nullable io.onedev.server.search.entity.EntityCriteria<CodeComment> criteria,
- @Nullable PullRequest request, CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {
+ @Nullable PullRequest request, CriteriaQuery<?> query, From<CodeComment, CodeComment> root, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
if (request != null)
predicates.add(builder.equal(CodeCommentQuery.getPath(root, CodeComment.PROP_COMPARE_CONTEXT + "." + CompareContext.PROP_PULL_REQUEST), request));
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index eea268b728..cf2fbc8bbd 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -43,7 +43,7 @@ import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.build.BuildFinished;
-import io.onedev.server.event.issue.IssueChangeEvent;
+import io.onedev.server.event.issue.IssueChanged;
import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
import io.onedev.server.event.pullrequest.PullRequestOpened;
import io.onedev.server.event.system.SystemStarted;
@@ -75,6 +75,7 @@ import io.onedev.server.model.support.issue.transitiontrigger.MergePullRequestTr
import io.onedev.server.model.support.issue.transitiontrigger.NoActivityTrigger;
import io.onedev.server.model.support.issue.transitiontrigger.OpenPullRequestTrigger;
import io.onedev.server.model.support.issue.transitiontrigger.PullRequestTrigger;
+import io.onedev.server.model.support.issue.transitiontrigger.StateTransitionTrigger;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;
@@ -156,7 +157,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
@Override
public void save(IssueChange change) {
dao.persist(change);
- listenerRegistry.post(new IssueChangeEvent(change));
+ listenerRegistry.post(new IssueChanged(change));
}
@Transactional
@@ -278,6 +279,75 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
return OneDev.getInstance(SettingManager.class).getIssueSetting().getTransitionSpecs();
}
+ @Transactional
+ @Listen
+ public void on(IssueChanged event) {
+ if (event.getChange().getData() instanceof IssueStateChangeData) {
+ Long issueId = event.getIssue().getId();
+ Long projectId = event.getIssue().getProject().getId();
+
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ executorService.execute(new Runnable() {
+
+ @Override
+ public void run() {
+ LockUtils.call(getLockKey(projectId), new Callable<Void>() {
+
+ @Override
+ public Void call() throws Exception {
+ transactionManager.run(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ SecurityUtils.bindAsSystem();
+ Issue issue = issueManager.load(issueId);
+ for (TransitionSpec transition: getTransitionSpecs()) {
+ if (transition.getTrigger() instanceof StateTransitionTrigger) {
+ Project project = issue .getProject();
+ StateTransitionTrigger trigger = (StateTransitionTrigger) transition.getTrigger();
+ if (trigger.getStates().contains(issue.getState())) {
+ IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true, false, false, false, false, true);
+ List<IssueCriteria> criterias = new ArrayList<>();
+
+ List<IssueCriteria> fromStateCriterias = new ArrayList<>();
+ for (String fromState: transition.getFromStates())
+ fromStateCriterias.add(new StateCriteria(fromState));
+
+ criterias.add(IssueCriteria.or(fromStateCriterias));
+ if (query.getCriteria() != null)
+ criterias.add(query.getCriteria());
+ query = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());
+ Issue.push(issue);
+ try {
+ for (Issue each: issueManager.query(project, false, query, 0, Integer.MAX_VALUE, true)) {
+ changeState(each, transition.getToState(), new HashMap<>(),
+ transition.getRemoveFields(), null);
+ }
+ } finally {
+ Issue.pop();
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ logger.error("Error changing issue state", e);
+ }
+ }
+ });
+ return null;
+ }
+ });
+ }
+ });
+ }
+ });
+ }
+ }
+
@Transactional
@Listen
public void on(BuildFinished event) {
@@ -311,7 +381,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
if ((trigger.getJobNames() == null || PatternSet.parse(trigger.getJobNames()).matches(new StringMatcher(), build.getJobName()))
&& build.getStatus() == Build.Status.SUCCESSFUL
&& (branches == null || project.isCommitOnBranches(commitId, branches))) {
- IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true, false, true, false, false);
+ IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true, false, true, false, false, false);
List<IssueCriteria> criterias = new ArrayList<>();
List<IssueCriteria> fromStateCriterias = new ArrayList<>();
@@ -376,7 +446,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
if (transition.getTrigger().getClass() == triggerClass) {
PullRequestTrigger trigger = (PullRequestTrigger) transition.getTrigger();
if (trigger.getBranches() == null || PatternSet.parse(trigger.getBranches()).matches(matcher, request.getTargetBranch())) {
- IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true, false, false, true, false);
+ IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true, false, false, true, false, false);
List<IssueCriteria> criterias = new ArrayList<>();
List<IssueCriteria> fromStateCriterias = new ArrayList<>();
@@ -502,7 +572,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
Matcher matcher = new PathMatcher();
if (branches == null || PatternSet.parse(branches).matches(matcher, branchName)) {
IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(),
- true, false, false, false, true);
+ true, false, false, false, true, false);
List<IssueCriteria> criterias = new ArrayList<>();
List<IssueCriteria> fromStateCriterias = new ArrayList<>();
@@ -558,7 +628,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
if (transition.getTrigger() instanceof NoActivityTrigger) {
NoActivityTrigger trigger = (NoActivityTrigger) transition.getTrigger();
IssueQuery query = IssueQuery.parse(null, trigger.getIssueQuery(),
- false, false, false, false, false);
+ false, false, false, false, false, false);
List<IssueCriteria> criterias = new ArrayList<>();
List<IssueCriteria> fromStateCriterias = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java
index 13911947ab..a8fdc6a6d0 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java
@@ -27,13 +27,13 @@ public class DefaultIssueLinkManager extends BaseEntityManager<IssueLink> implem
if (spec.getOpposite() != null) {
Collection<IssueLink> links = opposite?issue.getSourceLinks():issue.getTargetLinks();
for (IssueLink link: links) {
- if (!linkedIssues.contains(link.getLinked(issue)))
+ if (link.getSpec().equals(spec) && !linkedIssues.contains(link.getLinked(issue)))
delete(link);
}
for (Issue linkedIssue: linkedIssues) {
boolean found = false;
for (IssueLink link: links) {
- if (link.getLinked(issue).equals(linkedIssue)) {
+ if (link.getSpec().equals(spec) && link.getLinked(issue).equals(linkedIssue)) {
found = true;
break;
}
@@ -53,13 +53,13 @@ public class DefaultIssueLinkManager extends BaseEntityManager<IssueLink> implem
}
} else {
for (IssueLink link: issue.getLinks()) {
- if (!linkedIssues.contains(link.getLinked(issue)))
+ if (link.getSpec().equals(spec) && !linkedIssues.contains(link.getLinked(issue)))
delete(link);
}
for (Issue linkedIssue: linkedIssues) {
boolean found = false;
for (IssueLink link: issue.getLinks()) {
- if (link.getLinked(issue).equals(linkedIssue)) {
+ if (link.getSpec().equals(spec) && link.getLinked(issue).equals(linkedIssue)) {
found = true;
break;
}
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.java
index 9bd7686f30..c27a793afc 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
@@ -21,6 +21,7 @@ import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.util.lang.Objects;
@@ -35,11 +36,13 @@ import com.google.common.base.Preconditions;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.loader.Listen;
import io.onedev.commons.loader.ListenerRegistry;
+import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueCommentManager;
import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
import io.onedev.server.entitymanager.IssueScheduleManager;
+import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.RoleManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -48,15 +51,17 @@ import io.onedev.server.entityreference.EntityReferenceManager;
import io.onedev.server.entityreference.ReferenceMigrator;
import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.event.entity.EntityRemoved;
-import io.onedev.server.event.issue.IssueChangeEvent;
+import io.onedev.server.event.issue.IssueChanged;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.IssueField;
+import io.onedev.server.model.IssueLink;
import io.onedev.server.model.IssueQueryPersonalization;
import io.onedev.server.model.IssueSchedule;
+import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
@@ -307,8 +312,8 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
@Listen
public void on(IssueEvent event) {
boolean minorChange = false;
- if (event instanceof IssueChangeEvent) {
- IssueChangeData changeData = ((IssueChangeEvent)event).getChange().getData();
+ if (event instanceof IssueChanged) {
+ IssueChangeData changeData = ((IssueChanged)event).getChange().getData();
if (changeData instanceof ReferencedFromAware)
minorChange = true;
}
@@ -403,7 +408,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
List<NamedIssueQuery> namedQueries) {
for (NamedIssueQuery namedQuery: namedQueries) {
try {
- undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedStates());
+ undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true, true).getUndefinedStates());
} catch (Exception e) {
}
}
@@ -442,7 +447,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
@Nullable Project project, List<NamedIssueQuery> namedQueries) {
for (NamedIssueQuery namedQuery: namedQueries) {
try {
- undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFields());
+ undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true, true).getUndefinedFields());
} catch (Exception e) {
}
}
@@ -486,7 +491,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
@Nullable Project project, List<NamedIssueQuery> namedQueries) {
for (NamedIssueQuery namedQuery: namedQueries) {
try {
- undefinedFieldValues.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFieldValues());
+ undefinedFieldValues.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true, true).getUndefinedFieldValues());
} catch (Exception e) {
}
}
@@ -547,7 +552,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);
+ IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true, true);
if (parsedQuery.fixUndefinedStates(resolutions))
namedQuery.setQuery(parsedQuery.toString());
else
@@ -597,7 +602,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);
+ IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true, true);
if (parsedQuery.fixUndefinedFields(resolutions))
namedQuery.setQuery(parsedQuery.toString());
else
@@ -649,7 +654,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);
+ IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true, true);
if (query.fixUndefinedFieldValues(resolutions))
namedQuery.setQuery(query.toString());
else
@@ -955,5 +960,39 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
criteria.add(Restrictions.gt("id", afterIssueId));
return query(criteria, 0, count);
}
+
+ @Sessional
+ @Override
+ public void test() {
+ CriteriaBuilder builder = getSession().getCriteriaBuilder();
+ CriteriaQuery<Issue> issueQuery = builder.createQuery(Issue.class);
+ Root<Issue> issueRoot = issueQuery.from(Issue.class);
+
+ Subquery<IssueLink> linkQuery = issueQuery.subquery(IssueLink.class);
+ Root<IssueLink> linkRoot = linkQuery.from(IssueLink.class);
+ Join<Issue, Issue> linkedIssueJoin = linkRoot.join(IssueLink.PROP_TARGET, JoinType.INNER);
+ linkQuery.select(linkRoot);
+
+ Subquery<IssueField> fieldQuery = issueQuery.subquery(IssueField.class);
+ Root<IssueField> fieldRoot = fieldQuery.from(IssueField.class);
+ fieldQuery.select(fieldRoot);
+
+ Predicate issuePredicate = builder.equal(fieldRoot.get(IssueField.PROP_ISSUE), linkedIssueJoin);
+ Predicate namePredicate = builder.equal(fieldRoot.get(IssueField.PROP_NAME), "Assignees");
+ Predicate valuePredicate = builder.equal(fieldRoot.get(IssueField.PROP_VALUE), "robin");
+
+ LinkSpec linkSpec = OneDev.getInstance(LinkSpecManager.class).find("Parent");
+ issueQuery.where(builder.exists(linkQuery.where(
+ builder.equal(linkRoot.get(IssueLink.PROP_SOURCE), issueRoot),
+ builder.equal(linkRoot.get(IssueLink.PROP_SPEC), linkSpec),
+ builder.exists(fieldQuery.where(issuePredicate, namePredicate, valuePredicate)))
+ ));
+
+ Query<Issue> query = getSession().createQuery(issueQuery);
+ System.out.println("*** Results ***");
+ for (Issue issue: query.getResultList()) {
+ System.out.println(issue.getTitle());
+ }
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java
index e3ff3629ef..45583da07d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java
@@ -1,11 +1,15 @@
package io.onedev.server.entitymanager.impl;
+import java.util.Comparator;
+import java.util.List;
+
import javax.inject.Inject;
import javax.inject.Singleton;
import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.model.LinkSpec;
import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@@ -29,4 +33,21 @@ public class DefaultLinkSpecManager extends BaseEntityManager<LinkSpec> implemen
return null;
}
+ @Override
+ public List<LinkSpec> queryAndSort() {
+ List<LinkSpec> links = query();
+ links.sort(Comparator.comparing(LinkSpec::getOrder));
+ return links;
+ }
+
+ @Transactional
+ @Override
+ public void updateOrders(List<LinkSpec> links) {
+ for (int i=0; i<links.size(); i++) {
+ LinkSpec link = links.get(i);
+ link.setOrder(i+1);
+ save(link);
+ }
+ }
+
}
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.java
index b74470dd2d..db67ec661b 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
@@ -23,6 +23,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
@@ -705,29 +706,29 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
}
private Predicate[] getPredicates(@Nullable io.onedev.server.search.entity.EntityCriteria<Project> criteria,
- CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {
+ CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
if (!SecurityUtils.isAdministrator()) {
Collection<Long> projectIds = getPermittedProjects(new AccessProject())
.stream().map(it->it.getId()).collect(Collectors.toSet());
if (!projectIds.isEmpty())
- predicates.add(root.get(Project.PROP_ID).in(projectIds));
+ predicates.add(from.get(Project.PROP_ID).in(projectIds));
else
predicates.add(builder.disjunction());
}
if (criteria != null)
- predicates.add(criteria.getPredicate(query, root, builder));
+ predicates.add(criteria.getPredicate(query, from, builder));
return predicates.toArray(new Predicate[0]);
}
@Sessional
@Override
- public List<Project> query(EntityQuery<Project> projectQuery, int firstResult, int maxResults) {
- CriteriaQuery<Project> criteriaQuery = buildCriteriaQuery(getSession(), projectQuery);
- Query<Project> query = getSession().createQuery(criteriaQuery);
- query.setFirstResult(firstResult);
- query.setMaxResults(maxResults);
- return query.getResultList();
+ public List<Project> query(EntityQuery<Project> query, int firstResult, int maxResults) {
+ CriteriaQuery<Project> criteriaQuery = buildCriteriaQuery(getSession(), query);
+ Query<Project> projectQuery = getSession().createQuery(criteriaQuery);
+ projectQuery.setFirstResult(firstResult);
+ projectQuery.setMaxResults(maxResults);
+ return projectQuery.getResultList();
}
@Sessional
@@ -800,31 +801,31 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
return ids;
}
- private Collection<Long> getTreeIds(Long treeRootId) {
- Collection<Long> treeIds = Sets.newHashSet(treeRootId);
+ private Collection<Long> getTreeIds(Long projectId) {
+ Collection<Long> treeIds = Sets.newHashSet(projectId);
for (ProjectFacade facade: cache.values()) {
- if (treeRootId.equals(facade.getParentId()))
+ if (projectId.equals(facade.getParentId()))
treeIds.addAll(getTreeIds(facade.getId()));
}
return treeIds;
}
@Override
- public Predicate getPathMatchPredicate(CriteriaBuilder builder, Path<Project> project, String pathPattern) {
+ public Predicate getPathMatchPredicate(CriteriaBuilder builder, Path<Project> jpaPath, String pathPattern) {
cacheLock.readLock().lock();
try {
- return io.onedev.server.search.entity.EntityCriteria.inManyValues(builder, project.get(Project.PROP_ID),
+ return io.onedev.server.search.entity.EntityCriteria.inManyValues(builder, jpaPath.get(Project.PROP_ID),
getMatchingIds(pathPattern), cache.keySet());
} finally {
cacheLock.readLock().unlock();
}
}
- public Predicate getTreePredicate(CriteriaBuilder builder, Path<Project> project, Project treeRoot) {
+ public Predicate getTreePredicate(CriteriaBuilder builder, Path<Project> jpaPath, Project project) {
cacheLock.readLock().lock();
try {
- return io.onedev.server.search.entity.EntityCriteria.inManyValues(builder, project.get(Project.PROP_ID),
- getTreeIds(treeRoot.getId()), cache.keySet());
+ return io.onedev.server.search.entity.EntityCriteria.inManyValues(builder, jpaPath.get(Project.PROP_ID),
+ getTreeIds(project.getId()), cache.keySet());
} finally {
cacheLock.readLock().unlock();
}
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.java
index ba9e595907..24c6802a53 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
@@ -28,6 +28,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
@@ -893,7 +894,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
private Predicate[] getPredicates(@Nullable Project targetProject,
@Nullable io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,
- CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
+ CriteriaQuery<?> query, From<PullRequest, PullRequest> root, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
if (targetProject != null) {
predicates.add(builder.equal(root.get(PullRequest.PROP_TARGET_PROJECT), targetProject));
diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java
similarity index 91%
rename from server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java
rename to server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java
index b74284826e..f7927022c1 100644
--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java
@@ -8,11 +8,11 @@ import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
import io.onedev.server.notification.ActivityDetail;
-public class IssueChangeEvent extends IssueEvent {
+public class IssueChanged extends IssueEvent {
private final IssueChange change;
- public IssueChangeEvent(IssueChange change) {
+ public IssueChanged(IssueChange change) {
super(change.getUser(), change.getDate(), change.getIssue());
this.change = change;
}
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 3ba0858083..ebfb2529b0 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -3317,7 +3317,7 @@ public class DataMigrator {
}
- // Migrate to 5.5.0
+ // Migrate to 6.0.0
private void migrate71(File dataDir, Stack<Integer> versions) {
Map<String, String> issueScopes = new HashMap<>();
Map<Pair<String, String>, String> issueIds = new HashMap<>();
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index 98ceaf42d6..bd1437ce27 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -23,6 +23,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Stack;
import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -69,6 +70,7 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.AttachmentStorageSupport;
import io.onedev.server.util.CollectionUtils;
+import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.Input;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.facade.IssueFacade;
@@ -76,6 +78,8 @@ import io.onedev.server.util.validation.ProjectPathValidator;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.util.IssueAware;
+import io.onedev.server.web.util.WicketUtils;
@Entity
@Table(
@@ -193,6 +197,15 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
ISSUE_FIX_PATTERN = Pattern.compile(builder.toString());
}
+ private static ThreadLocal<Stack<Issue>> stack = new ThreadLocal<Stack<Issue>>() {
+
+ @Override
+ protected Stack<Issue> initialValue() {
+ return new Stack<Issue>();
+ }
+
+ };
+
@Column(nullable=false)
private String state;
@@ -892,4 +905,27 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
}
}
+ @Nullable
+ public static Issue get() {
+ if (!stack.get().isEmpty()) {
+ return stack.get().peek();
+ } else {
+ ComponentContext componentContext = ComponentContext.get();
+ if (componentContext != null) {
+ IssueAware issueAware = WicketUtils.findInnermost(componentContext.getComponent(), IssueAware.class);
+ if (issueAware != null)
+ return issueAware.getIssue();
+ }
+ return null;
+ }
+ }
+
+ public static void push(@Nullable Issue issue) {
+ stack.get().push(issue);
+ }
+
+ public static void pop() {
+ stack.get().pop();
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
index 519c0153a5..c4f98efdcc 100644
--- a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
@@ -12,7 +12,6 @@ import javax.persistence.OneToMany;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.model.support.issue.LinkSpecOpposite;
-import io.onedev.server.util.validation.annotation.LinkName;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.IssueQuery;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@@ -34,11 +33,12 @@ public class LinkSpec extends AbstractEntity {
@Column(length=65535)
private LinkSpecOpposite opposite;
+ private int order;
+
@OneToMany(mappedBy=IssueLink.PROP_SPEC, cascade=CascadeType.REMOVE)
private Collection<IssueLink> links = new ArrayList<>();
@Editable(order=100, description="Name of the link")
- @LinkName
@NotEmpty
public String getName() {
return name;
@@ -59,8 +59,7 @@ public class LinkSpec extends AbstractEntity {
@Editable(order=160, name="Linkable Issues", description="Optionally specify criteria of issues which can be linked")
- @IssueQuery(withCurrentBuildCriteria=false, withCurrentCommitCriteria=false, withCurrentPullRequestCriteria=false,
- withCurrentUserCriteria=false, withOrder=false)
+ @IssueQuery
@NameOfEmptyValue("All issues")
public String getIssueQuery() {
return issueQuery;
@@ -83,5 +82,13 @@ public class LinkSpec extends AbstractEntity {
public String getName(boolean opposite) {
return opposite?getOpposite().getName():getName();
}
+
+ public int getOrder() {
+ return order;
+ }
+
+ public void setOrder(int order) {
+ this.order = order;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index 7e4c24203d..854648ed5e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -347,7 +347,7 @@ public class GlobalIssueSetting implements Serializable {
undefinedStates.addAll(template.getUndefinedStates());
for (NamedIssueQuery namedQuery: getNamedQueries()) {
try {
- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true, true);
undefinedStates.addAll(query.getUndefinedStates());
} catch (Exception e) {
}
@@ -372,7 +372,7 @@ public class GlobalIssueSetting implements Serializable {
undefinedFields.addAll(template.getUndefinedFields());
for (NamedIssueQuery namedQuery: getNamedQueries()) {
try {
- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true, true);
undefinedFields.addAll(query.getUndefinedFields());
} catch (Exception e) {
}
@@ -392,7 +392,7 @@ public class GlobalIssueSetting implements Serializable {
undefinedFieldValues.addAll(template.getUndefinedFieldValues());
for (NamedIssueQuery namedQuery: getNamedQueries()) {
try {
- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true, true);
undefinedFieldValues.addAll(query.getUndefinedFieldValues());
} catch (Exception e) {
}
@@ -416,7 +416,7 @@ public class GlobalIssueSetting implements Serializable {
for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true, true);
if (query.fixUndefinedStates(resolutions))
namedQuery.setQuery(query.toString());
else
@@ -449,7 +449,7 @@ public class GlobalIssueSetting implements Serializable {
for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true, true);
if (query.fixUndefinedFields(resolutions))
namedQuery.setQuery(query.toString());
else
@@ -486,7 +486,7 @@ public class GlobalIssueSetting implements Serializable {
for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true, true);
if (query.fixUndefinedFieldValues(resolutions))
namedQuery.setQuery(query.toString());
else
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java b/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java
index 0f74573a88..17238f8f4f 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java
@@ -38,9 +38,7 @@ public class DefaultFixedIssueFilter implements Serializable {
}
@Editable(order=200, description="Specify a default query to filter/order fixed issues of specified jobs")
- @IssueQuery(withCurrentBuildCriteria = false, withCurrentCommitCriteria = false,
- withCurrentPullRequestCriteria = false, withCurrentUserCriteria = true,
- withOrder = true)
+ @IssueQuery(withCurrentUserCriteria = true)
@NotEmpty
public String getIssueQuery() {
return issueQuery;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
index e16fc6cdcc..c01975f406 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
@@ -125,7 +125,7 @@ public class ProjectBuildSetting implements Serializable {
for (DefaultFixedIssueFilter filter: defaultFixedIssueFilters) {
try {
- undefinedStates.addAll(IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false).getUndefinedStates());
+ undefinedStates.addAll(IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false, false).getUndefinedStates());
} catch (Exception e) {
}
}
@@ -137,7 +137,7 @@ public class ProjectBuildSetting implements Serializable {
Set<String> undefinedFields = new HashSet<>();
for (DefaultFixedIssueFilter filter: defaultFixedIssueFilters) {
try {
- undefinedFields.addAll(IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false).getUndefinedFields());
+ undefinedFields.addAll(IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false, false).getUndefinedFields());
} catch (Exception e) {
}
}
@@ -148,7 +148,7 @@ public class ProjectBuildSetting implements Serializable {
Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
for (DefaultFixedIssueFilter filter: defaultFixedIssueFilters) {
try {
- undefinedFieldValues.addAll(IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false).getUndefinedFieldValues());
+ undefinedFieldValues.addAll(IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false, false).getUndefinedFieldValues());
} catch (Exception e) {
}
}
@@ -159,7 +159,7 @@ public class ProjectBuildSetting implements Serializable {
for (Iterator<DefaultFixedIssueFilter> it = defaultFixedIssueFilters.iterator(); it.hasNext();) {
DefaultFixedIssueFilter filter = it.next();
try {
- IssueQuery parsedQuery = IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false);
+ IssueQuery parsedQuery = IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false, false);
if (parsedQuery.fixUndefinedStates(resolutions))
filter.setIssueQuery(parsedQuery.toString());
else
@@ -173,7 +173,7 @@ public class ProjectBuildSetting implements Serializable {
for (Iterator<DefaultFixedIssueFilter> it = defaultFixedIssueFilters.iterator(); it.hasNext();) {
DefaultFixedIssueFilter filter = it.next();
try {
- IssueQuery parsedQuery = IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false);
+ IssueQuery parsedQuery = IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false, false);
if (parsedQuery.fixUndefinedFields(resolutions))
filter.setIssueQuery(parsedQuery.toString());
else
@@ -187,7 +187,7 @@ public class ProjectBuildSetting implements Serializable {
for (Iterator<DefaultFixedIssueFilter> it = defaultFixedIssueFilters.iterator(); it.hasNext();) {
DefaultFixedIssueFilter filter = it.next();
try {
- IssueQuery parsedQuery = IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false);
+ IssueQuery parsedQuery = IssueQuery.parse(project, filter.getIssueQuery(), false, false, false, false, false, false);
if (parsedQuery.fixUndefinedFieldValues(resolutions))
filter.setIssueQuery(parsedQuery.toString());
else
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.java
index f203b5aa88..145703c0a5 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
@@ -71,8 +71,7 @@ public class BoardSpec implements Serializable {
}
@Editable(order=200, description="Optionally specify a base query to filter/order issues of the board")
- @IssueQuery(withCurrentUserCriteria = true, withCurrentBuildCriteria = false,
- withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = false)
+ @IssueQuery(withCurrentUserCriteria = true)
@Nullable
public String getBaseQuery() {
return baseQuery;
@@ -84,8 +83,7 @@ public class BoardSpec implements Serializable {
@Editable(order=250, description="Optionally specify a base query to filter/order issues in backlog. "
+ "Backlog issues are those not associating with any milestones")
- @IssueQuery(withCurrentUserCriteria = true, withCurrentBuildCriteria = false,
- withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = false)
+ @IssueQuery(withCurrentUserCriteria = true)
@Nullable
public String getBacklogBaseQuery() {
return backlogBaseQuery;
@@ -236,7 +234,7 @@ public class BoardSpec implements Serializable {
if (query != null) {
try {
undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(
- project, query, false, true, true, true, true).getUndefinedStates());
+ project, query, false, true, true, true, true, true).getUndefinedStates());
} catch (Exception e) {
}
}
@@ -267,7 +265,7 @@ public class BoardSpec implements Serializable {
if (query != null) {
try {
undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery
- .parse(project, query, false, true, true, true, true).getUndefinedFields());
+ .parse(project, query, false, true, true, true, true, true).getUndefinedFields());
} catch (Exception e) {
}
}
@@ -295,7 +293,7 @@ public class BoardSpec implements Serializable {
if (query != null) {
try {
io.onedev.server.search.entity.issue.IssueQuery parsedQuery =
- io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true, true);
undefinedFieldValues.addAll(parsedQuery.getUndefinedFieldValues());
} catch (Exception e) {
}
@@ -324,7 +322,7 @@ public class BoardSpec implements Serializable {
if (query != null) {
try {
io.onedev.server.search.entity.issue.IssueQuery parsedQuery =
- io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true, true);
if (parsedQuery.fixUndefinedStates(resolutions))
query = parsedQuery.toString();
else
@@ -359,7 +357,7 @@ public class BoardSpec implements Serializable {
if (query != null) {
try {
io.onedev.server.search.entity.issue.IssueQuery parsedQuery =
- io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true, true);
if (parsedQuery.fixUndefinedFields(resolutions))
query = parsedQuery.toString();
else
@@ -389,7 +387,7 @@ public class BoardSpec implements Serializable {
if (query != null) {
try {
io.onedev.server.search.entity.issue.IssueQuery parsedQuery =
- io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true, true);
if (parsedQuery.fixUndefinedFieldValues(resolutions))
query = parsedQuery.toString();
else
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java
index 4be7d13d2f..14ad298bc2 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java
@@ -28,9 +28,7 @@ public class IssueTemplate implements Serializable {
@Editable(order=100, name="Applicable Issues", description="Optionally specify issues applicable for this template. "
+ "Leave empty for all")
- @IssueQuery(withCurrentBuildCriteria = false, withCurrentCommitCriteria = false,
- withCurrentPullRequestCriteria = false, withCurrentUserCriteria = false,
- withOrder = false)
+ @IssueQuery(withOrder = false)
@NameOfEmptyValue("All")
public String getIssueQuery() {
return issueQuery;
@@ -56,7 +54,7 @@ public class IssueTemplate implements Serializable {
if (issueQuery != null) {
try {
undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(
- null, issueQuery, false, true, true, true, true).getUndefinedStates());
+ null, issueQuery, false, true, true, true, true, true).getUndefinedStates());
} catch (Exception e) {
}
}
@@ -68,7 +66,7 @@ public class IssueTemplate implements Serializable {
if (issueQuery != null) {
try {
undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery
- .parse(null, issueQuery, false, true, true, true, true).getUndefinedFields());
+ .parse(null, issueQuery, false, true, true, true, true, true).getUndefinedFields());
} catch (Exception e) {
}
}
@@ -80,7 +78,7 @@ public class IssueTemplate implements Serializable {
if (issueQuery != null) {
try {
io.onedev.server.search.entity.issue.IssueQuery parsedQuery =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true, true);
undefinedFieldValues.addAll(parsedQuery.getUndefinedFieldValues());
} catch (Exception e) {
}
@@ -92,7 +90,7 @@ public class IssueTemplate implements Serializable {
if (issueQuery != null) {
try {
io.onedev.server.search.entity.issue.IssueQuery parsedQuery =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true, true);
if (parsedQuery.fixUndefinedStates(resolutions))
issueQuery = parsedQuery.toString();
else
@@ -107,7 +105,7 @@ public class IssueTemplate implements Serializable {
if (issueQuery != null) {
try {
io.onedev.server.search.entity.issue.IssueQuery parsedQuery =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true, true);
if (parsedQuery.fixUndefinedFields(resolutions))
issueQuery = parsedQuery.toString();
else
@@ -122,7 +120,7 @@ public class IssueTemplate implements Serializable {
if (issueQuery != null) {
try {
io.onedev.server.search.entity.issue.IssueQuery parsedQuery =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true, true);
if (parsedQuery.fixUndefinedFieldValues(resolutions))
issueQuery = parsedQuery.toString();
else
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java
index 42d11975cf..90f3945277 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java
@@ -4,7 +4,6 @@ import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
-import io.onedev.server.util.validation.annotation.LinkName;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.IssueQuery;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@@ -22,7 +21,6 @@ public class LinkSpecOpposite implements Serializable {
@Editable(order=100, name="Name On the Other Side", description="Name of the link on the other side. "
+ "For instance if name is <tt>child issues</tt>, name on the other side can be <tt>parent issue</tt>")
- @LinkName
@NotEmpty
public String getName() {
return name;
@@ -45,8 +43,7 @@ public class LinkSpecOpposite implements Serializable {
@Editable(order=300, name="Linkable Issues On the Other Side", description="Optionally specify criteria of "
+ "issues which can be linked on the other side")
- @IssueQuery(withCurrentBuildCriteria=false, withCurrentCommitCriteria=false, withCurrentPullRequestCriteria=false,
- withCurrentUserCriteria=false, withOrder=false)
+ @IssueQuery(withOrder = false)
@NameOfEmptyValue("All issues")
public String getIssueQuery() {
return issueQuery;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java
index 5b225d8add..379b1eae8e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java
@@ -36,8 +36,7 @@ public class NamedIssueQuery implements NamedQuery {
}
@Editable
- @IssueQuery(withCurrentUserCriteria = true, withCurrentBuildCriteria = false,
- withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = false)
+ @IssueQuery(withCurrentUserCriteria = true)
@NameOfEmptyValue("All")
@Override
public String getQuery() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
index bef1fe6dbf..0290a89aec 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
@@ -111,7 +111,7 @@ public class ProjectIssueSetting implements Serializable {
if (namedQueries != null) {
for (NamedIssueQuery namedQuery: namedQueries) {
try {
- undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedStates());
+ undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true, true).getUndefinedStates());
} catch (Exception e) {
}
}
@@ -136,7 +136,7 @@ public class ProjectIssueSetting implements Serializable {
if (namedQueries != null) {
for (NamedIssueQuery namedQuery: namedQueries) {
try {
- undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFields());
+ undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true, true).getUndefinedFields());
} catch (Exception e) {
}
}
@@ -153,7 +153,7 @@ public class ProjectIssueSetting implements Serializable {
if (namedQueries != null) {
for (NamedIssueQuery namedQuery: namedQueries) {
try {
- undefinedFieldValues.addAll(IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFieldValues());
+ undefinedFieldValues.addAll(IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true, true).getUndefinedFieldValues());
} catch (Exception e) {
}
}
@@ -170,7 +170,7 @@ public class ProjectIssueSetting implements Serializable {
for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);
+ IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true, true);
if (parsedQuery.fixUndefinedStates(resolutions))
namedQuery.setQuery(parsedQuery.toString());
else
@@ -199,7 +199,7 @@ public class ProjectIssueSetting implements Serializable {
for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);
+ IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true, true);
if (parsedQuery.fixUndefinedFields(resolutions))
namedQuery.setQuery(parsedQuery.toString());
else
@@ -222,7 +222,7 @@ public class ProjectIssueSetting implements Serializable {
for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);
+ IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true, true);
if (parsedQuery.fixUndefinedFieldValues(resolutions))
namedQuery.setQuery(parsedQuery.toString());
else
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
index eb78d9e0ed..1a5ffcd3f3 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
@@ -129,7 +129,7 @@ public class TransitionSpec implements Serializable {
PressButtonTrigger pressButton = (PressButtonTrigger) getTrigger();
if (pressButton.isAuthorized(issue.getProject())) {
IssueQuery parsedQuery = IssueQuery.parse(issue.getProject(),
- getTrigger().getIssueQuery(), true, true, true, true, true);
+ getTrigger().getIssueQuery(), true, true, true, true, true, true);
return parsedQuery.matches(issue);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java
index aa956b7618..588d83fb56 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java
@@ -47,8 +47,7 @@ public class BranchUpdateTrigger extends TransitionTrigger {
}
@Editable(order=1000, name="Applicable Issues", description="Optionally specify issues applicable for this transition. Leave empty for all issues")
- @IssueQuery(withOrder = false, withCurrentUserCriteria = false, withCurrentBuildCriteria = false,
- withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = true)
+ @IssueQuery(withOrder = false, withCurrentCommitCriteria = true)
@NameOfEmptyValue("All")
@Override
public String getIssueQuery() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
index 5bb66fb070..b4cfaca689 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
@@ -73,8 +73,7 @@ public class BuildSuccessfulTrigger extends TransitionTrigger {
}
@Editable(order=1000, name="Applicable Issues", description="Optionally specify issues applicable for this transition. Leave empty for all issues")
- @IssueQuery(withOrder = false, withCurrentUserCriteria = false, withCurrentBuildCriteria = true,
- withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = false)
+ @IssueQuery(withOrder = false, withCurrentBuildCriteria = true)
@NameOfEmptyValue("All")
@Override
public String getIssueQuery() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
index 6fe865445a..49a5c92cf8 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
@@ -134,8 +134,7 @@ public class PressButtonTrigger extends TransitionTrigger {
}
@Editable(order=1000, name="Applicable Issues", description="Optionally specify issues applicable for this transition. Leave empty for all issues")
- @IssueQuery(withOrder = false, withCurrentUserCriteria = true, withCurrentBuildCriteria = false,
- withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = false)
+ @IssueQuery(withOrder = false, withCurrentUserCriteria = true)
@NameOfEmptyValue("All")
@Override
public String getIssueQuery() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java
index ce49b60d26..0e74464520 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java
@@ -40,8 +40,7 @@ public abstract class PullRequestTrigger extends TransitionTrigger {
}
@Editable(order=1000, name="Applicable Issues", description="Optionally specify issues applicable for this transition. Leave empty for all issues")
- @IssueQuery(withOrder = false, withCurrentUserCriteria = false, withCurrentBuildCriteria = false,
- withCurrentPullRequestCriteria = true, withCurrentCommitCriteria = false)
+ @IssueQuery(withOrder = false, withCurrentPullRequestCriteria = true)
@NameOfEmptyValue("All")
@Override
public String getIssueQuery() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java
new file mode 100644
index 0000000000..4903bf8acf
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java
@@ -0,0 +1,61 @@
+package io.onedev.server.model.support.issue.transitiontrigger;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.constraints.Size;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.support.issue.StateSpec;
+import io.onedev.server.web.editable.annotation.ChoiceProvider;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.IssueQuery;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+import io.onedev.server.web.editable.annotation.OmitName;
+
+@Editable(order=550, name="State of other issue is transited to")
+public class StateTransitionTrigger extends TransitionTrigger {
+
+ private static final long serialVersionUID = 1L;
+
+ private List<String> states = new ArrayList<>();
+
+ @Editable(order=100)
+ @OmitName
+ @ChoiceProvider("getStateChoices")
+ @Size(min=1, message="At least one state needs to be specified")
+ public List<String> getStates() {
+ return states;
+ }
+
+ public void setStates(List<String> states) {
+ this.states = states;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getStateChoices() {
+ List<String> stateNames = new ArrayList<>();
+ for (StateSpec state: OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpecs())
+ stateNames.add(state.getName());
+ return stateNames;
+ }
+
+ @Editable(order=1000, name="Applicable Issues", description="Optionally specify issues applicable for this transition. Leave empty for all issues")
+ @IssueQuery(withOrder = false, withCurrentIssueCriteria = true)
+ @NameOfEmptyValue("All")
+ @Override
+ public String getIssueQuery() {
+ return super.getIssueQuery();
+ }
+
+ public void setIssueQuery(String issueQuery) {
+ super.setIssueQuery(issueQuery);
+ }
+
+ @Override
+ public String getDescription() {
+ return "State of an issue is transited to " + states;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java
index dd77bed340..06d0cee699 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java
@@ -22,8 +22,7 @@ public abstract class TransitionTrigger implements Serializable {
private String issueQuery;
@Editable(order=1000, name="Applicable Issues", description="Optionally specify issues applicable for this transition. Leave empty for all issues. ")
- @IssueQuery(withOrder = false, withCurrentUserCriteria = false, withCurrentBuildCriteria = false,
- withCurrentPullRequestCriteria = false, withCurrentCommitCriteria = false)
+ @IssueQuery(withOrder = false)
@NameOfEmptyValue("All")
public String getIssueQuery() {
return issueQuery;
@@ -47,7 +46,7 @@ public abstract class TransitionTrigger implements Serializable {
public Collection<String> getUndefinedStates() {
try {
return io.onedev.server.search.entity.issue.IssueQuery
- .parse(null, issueQuery, false, true, true, true, true).getUndefinedStates();
+ .parse(null, issueQuery, false, true, true, true, true, true).getUndefinedStates();
} catch (Exception e) {
return new HashSet<>();
}
@@ -56,7 +55,7 @@ public abstract class TransitionTrigger implements Serializable {
public Collection<String> getUndefinedFields() {
try {
return io.onedev.server.search.entity.issue.IssueQuery
- .parse(null, issueQuery, false, true, true, true, true).getUndefinedFields();
+ .parse(null, issueQuery, false, true, true, true, true, true).getUndefinedFields();
} catch (Exception e) {
e.printStackTrace();
return new HashSet<>();
@@ -66,7 +65,7 @@ public abstract class TransitionTrigger implements Serializable {
public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
try {
return io.onedev.server.search.entity.issue.IssueQuery
- .parse(null, issueQuery, false, true, true, true, true).getUndefinedFieldValues();
+ .parse(null, issueQuery, false, true, true, true, true, true).getUndefinedFieldValues();
} catch (Exception e) {
return new HashSet<>();
}
@@ -75,7 +74,7 @@ public abstract class TransitionTrigger implements Serializable {
public boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {
try {
io.onedev.server.search.entity.issue.IssueQuery parsedQuery =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true, true);
if (parsedQuery.fixUndefinedStates(resolutions))
issueQuery = parsedQuery.toString();
else
@@ -88,7 +87,7 @@ public abstract class TransitionTrigger implements Serializable {
public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
try {
io.onedev.server.search.entity.issue.IssueQuery parsedQuery =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true, true);
if (parsedQuery.fixUndefinedFields(resolutions))
issueQuery = parsedQuery.toString();
else
@@ -101,7 +100,7 @@ public abstract class TransitionTrigger implements Serializable {
public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {
try {
io.onedev.server.search.entity.issue.IssueQuery parsedQuery =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true, true);
if (parsedQuery.fixUndefinedFieldValues(resolutions))
issueQuery = parsedQuery.toString();
else
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index f284ea80f4..fb5f1112d3 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -19,7 +19,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.entityreference.ReferencedFromAware;
-import io.onedev.server.event.issue.IssueChangeEvent;
+import io.onedev.server.event.issue.IssueChanged;
import io.onedev.server.event.issue.IssueCommented;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.event.issue.IssueOpened;
@@ -71,8 +71,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {
String url;
if (event instanceof IssueCommented)
url = urlManager.urlFor(((IssueCommented)event).getComment());
- else if (event instanceof IssueChangeEvent)
- url = urlManager.urlFor(((IssueChangeEvent)event).getChange());
+ else if (event instanceof IssueChanged)
+ url = urlManager.urlFor(((IssueChanged)event).getChange());
else
url = urlManager.urlFor(issue);
@@ -96,7 +96,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {
@Override
protected EntityQuery<Issue> parse(String queryString) {
- return IssueQuery.parse(issue.getProject(), queryString, true, true, false, false, false);
+ return IssueQuery.parse(issue.getProject(), queryString, true, true, false, false, false, false);
}
@Override
@@ -122,7 +122,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {
@Override
protected EntityQuery<Issue> parse(String queryString) {
- return IssueQuery.parse(null, queryString, true, true, false, false, false);
+ return IssueQuery.parse(null, queryString, true, true, false, false, false, false);
}
@Override
@@ -209,8 +209,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {
}
}
- if (!(event instanceof IssueChangeEvent)
- || !(((IssueChangeEvent) event).getChange().getData() instanceof ReferencedFromAware)) {
+ if (!(event instanceof IssueChanged)
+ || !(((IssueChanged) event).getChange().getData() instanceof ReferencedFromAware)) {
Collection<User> bccUsers = new HashSet<>();
for (IssueWatch watch: issue.getWatches()) {
diff --git a/server-core/src/main/java/io/onedev/server/rest/IssueResource.java b/server-core/src/main/java/io/onedev/server/rest/IssueResource.java
index e3b84816cc..92a0a905c1 100644
--- a/server-core/src/main/java/io/onedev/server/rest/IssueResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/IssueResource.java
@@ -184,7 +184,7 @@ public class IssueResource {
IssueQuery parsedQuery;
try {
- parsedQuery = IssueQuery.parse(null, query, true, true, false, false, false);
+ parsedQuery = IssueQuery.parse(null, query, true, true, false, false, false, false);
} catch (Exception e) {
throw new InvalidParamException("Error parsing query", e);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/AndEntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/AndEntityCriteria.java
index 69e51fffe8..3a8f3b4fa5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/AndEntityCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/AndEntityCriteria.java
@@ -5,8 +5,8 @@ import java.util.List;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.util.criteria.AndCriteria;
@@ -52,7 +52,7 @@ public class AndEntityCriteria<T extends AbstractEntity> extends EntityCriteria<
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<T> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<T, T> root, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
for (EntityCriteria<T> criteria: criterias)
predicates.add(criteria.getPredicate(query, root, builder));
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.java
index 9da74db01f..dbe0ce2831 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
@@ -7,9 +7,9 @@ import java.util.List;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.model.AbstractEntity;
@@ -22,9 +22,9 @@ public abstract class EntityCriteria<T extends AbstractEntity> extends Criteria<
public static final int IN_CLAUSE_LIMIT = 1000;
- public abstract Predicate getPredicate(CriteriaQuery<?> query, Root<T> root, CriteriaBuilder builder);
+ public abstract Predicate getPredicate(CriteriaQuery<?> query, From<T, T> from, CriteriaBuilder builder);
- public static Predicate inManyValues(CriteriaBuilder builder, Path<Long> attribute, Collection<Long> inValues,
+ public static Predicate inManyValues(CriteriaBuilder builder, Path<Long> path, Collection<Long> inValues,
Collection<Long> allValues) {
List<Long> listOfInValues = new ArrayList<>(inValues);
Collections.sort(listOfInValues);
@@ -38,8 +38,8 @@ public abstract class EntityCriteria<T extends AbstractEntity> extends Criteria<
discreteValues.addAll(range);
} else {
predicates.add(builder.and(
- builder.greaterThanOrEqualTo(attribute, range.get(0)),
- builder.lessThanOrEqualTo(attribute, range.get(range.size()-1))));
+ builder.greaterThanOrEqualTo(path, range.get(0)),
+ builder.lessThanOrEqualTo(path, range.get(range.size()-1))));
}
}
@@ -47,12 +47,12 @@ public abstract class EntityCriteria<T extends AbstractEntity> extends Criteria<
for (Long value: discreteValues) {
inClause.add(value);
if (inClause.size() == IN_CLAUSE_LIMIT) {
- predicates.add(attribute.in(inClause));
+ predicates.add(path.in(inClause));
inClause = new ArrayList<>();
}
}
if (!inClause.isEmpty())
- predicates.add(attribute.in(inClause));
+ predicates.add(path.in(inClause));
return builder.or(predicates.toArray(new Predicate[0]));
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/NotEntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/NotEntityCriteria.java
index 858bfcb094..bc650320e0 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/NotEntityCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/NotEntityCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.util.criteria.NotCriteria;
@@ -19,7 +19,7 @@ public class NotEntityCriteria<T extends AbstractEntity> extends EntityCriteria<
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<T> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<T, T> root, CriteriaBuilder builder) {
return criteria.getPredicate(query, root, builder).not();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/OrEntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/OrEntityCriteria.java
index 54e3941dd8..455a504d75 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/OrEntityCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/OrEntityCriteria.java
@@ -5,8 +5,8 @@ import java.util.List;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.util.criteria.OrCriteria;
@@ -22,7 +22,7 @@ public class OrEntityCriteria<T extends AbstractEntity> extends EntityCriteria<T
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<T> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<T, T> root, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
for (EntityCriteria<T> criteria: criterias)
predicates.add(criteria.getPredicate(query, root, builder));
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java
index 0d1784b3ba..ddf645b17c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.agent;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
@@ -24,15 +25,15 @@ public class AttributeCriteria extends EntityCriteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Subquery<AgentAttribute> attributeQuery = query.subquery(AgentAttribute.class);
- Root<AgentAttribute> attribute = attributeQuery.from(AgentAttribute.class);
- attributeQuery.select(attribute);
+ Root<AgentAttribute> attributeRoot = attributeQuery.from(AgentAttribute.class);
+ attributeQuery.select(attributeRoot);
return builder.exists(attributeQuery.where(
- builder.equal(attribute.get(AgentAttribute.PROP_AGENT), root),
- builder.equal(attribute.get(AgentAttribute.PROP_NAME), name),
- builder.equal(attribute.get(AgentAttribute.PROP_VALUE), value)));
+ builder.equal(attributeRoot.get(AgentAttribute.PROP_AGENT), from),
+ builder.equal(attributeRoot.get(AgentAttribute.PROP_NAME), name),
+ builder.equal(attributeRoot.get(AgentAttribute.PROP_VALUE), value)));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/CpuCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/CpuCriteria.java
index c92af894fb..1a1a667b88 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/CpuCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/CpuCriteria.java
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.agent;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Agent;
import io.onedev.server.search.entity.EntityCriteria;
@@ -24,8 +24,8 @@ public class CpuCriteria extends EntityCriteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- Path<Integer> attribute = root.get(Agent.PROP_CPU);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(Agent.PROP_CPU);
if (operator == AgentQueryLexer.IsGreaterThan)
return builder.greaterThan(attribute, value);
else if (operator == AgentQueryLexer.IsLessThan)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java
index 90625acd77..d2e875e70e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java
@@ -4,8 +4,8 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Agent;
import io.onedev.server.search.entity.EntityCriteria;
@@ -25,8 +25,8 @@ public class EverUsedSinceCriteria extends EntityCriteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- return builder.greaterThan(root.get(Agent.PROP_LAST_USED_DATE), date);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ return builder.greaterThan(from.get(Agent.PROP_LAST_USED_DATE), date);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java
index cac3941771..ee0e1dace9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.agent;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
@@ -22,13 +23,13 @@ public class HasAttributeCriteria extends EntityCriteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Subquery<AgentAttribute> attributeQuery = query.subquery(AgentAttribute.class);
Root<AgentAttribute> attribute = attributeQuery.from(AgentAttribute.class);
attributeQuery.select(attribute);
return builder.exists(attributeQuery.where(
- builder.equal(attribute.get(AgentAttribute.PROP_AGENT), root),
+ builder.equal(attribute.get(AgentAttribute.PROP_AGENT), from),
builder.equal(attribute.get(BuildParam.PROP_NAME), attributeName)));
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java
index c3880dccbc..85ad704a2f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java
@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.agent;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
@@ -18,8 +18,8 @@ public class HasRunningBuildsCriteria extends EntityCriteria<Agent> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(Agent.PROP_BUILDS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(Agent.PROP_BUILDS, JoinType.LEFT);
join.on(builder.equal(join.get(Build.PROP_STATUS), Build.Status.RUNNING));
return join.isNotNull();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java
index 4b2b59af26..748f0127a8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.agent;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Agent;
import io.onedev.server.search.entity.EntityCriteria;
@@ -21,8 +21,8 @@ public class IpAddressCriteria extends EntityCriteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- Path<String> attribute = root.get(Agent.PROP_IP_ADDRESS);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(Agent.PROP_IP_ADDRESS);
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/agent/MemoryCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/MemoryCriteria.java
index 1fd02a3058..14166b20f7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/MemoryCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/MemoryCriteria.java
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.agent;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Agent;
import io.onedev.server.search.entity.EntityCriteria;
@@ -24,8 +24,8 @@ public class MemoryCriteria extends EntityCriteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- Path<Integer> attribute = root.get(Agent.PROP_MEMORY);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(Agent.PROP_MEMORY);
if (operator == AgentQueryLexer.IsGreaterThan)
return builder.greaterThan(attribute, value);
else if (operator == AgentQueryLexer.IsLessThan)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java
index 9855ecf16d..c0a5fe8981 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.agent;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Agent;
import io.onedev.server.search.entity.EntityCriteria;
@@ -21,8 +21,8 @@ public class NameCriteria extends EntityCriteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- Path<String> attribute = root.get(Agent.PROP_NAME);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(Agent.PROP_NAME);
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/agent/NotUsedSinceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java
index 1cdf5ba328..64abdd194d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java
@@ -4,8 +4,8 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Agent;
import io.onedev.server.search.entity.EntityCriteria;
@@ -25,8 +25,8 @@ public class NotUsedSinceCriteria extends EntityCriteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- return builder.lessThan(root.get(Agent.PROP_LAST_USED_DATE), date);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ return builder.lessThan(from.get(Agent.PROP_LAST_USED_DATE), date);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java
index 0be654509f..d882060e5f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.agent;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Agent;
import io.onedev.server.search.entity.EntityCriteria;
@@ -13,8 +13,8 @@ public class OfflineCriteria extends EntityCriteria<Agent> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- return builder.not(new OnlineCriteria().getPredicate(query, root, builder));
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ return builder.not(new OnlineCriteria().getPredicate(query, from, builder));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java
index 9656c5897d..60a3269860 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java
@@ -4,14 +4,13 @@ import java.util.Collection;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.AgentManager;
import io.onedev.server.model.Agent;
-
import io.onedev.server.search.entity.EntityCriteria;
public class OnlineCriteria extends EntityCriteria<Agent> {
@@ -19,8 +18,8 @@ public class OnlineCriteria extends EntityCriteria<Agent> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- Path<?> attribute = root.get(Agent.PROP_ID);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ Path<?> attribute = from.get(Agent.PROP_ID);
Collection<Long> agentIds = OneDev.getInstance(AgentManager.class).getOnlineAgentIds();
if (!agentIds.isEmpty())
return attribute.in(agentIds);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
index 544629c8a3..438ba3716d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.agent;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Agent;
import io.onedev.server.search.entity.EntityCriteria;
@@ -21,8 +21,8 @@ public class OsArchCriteria extends EntityCriteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- Path<String> attribute = root.get(Agent.PROP_OS_ARCH);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(Agent.PROP_OS_ARCH);
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/agent/OsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java
index 16c8db3f78..dc8f342146 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.agent;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.agent.AgentOs;
import io.onedev.server.model.Agent;
@@ -20,8 +20,8 @@ public class OsCriteria extends EntityCriteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- return builder.equal(root.get(Agent.PROP_OS), value);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ return builder.equal(from.get(Agent.PROP_OS), value);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java
index e0c5ba5aee..e3bbfcdd5b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.agent;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Agent;
import io.onedev.server.search.entity.EntityCriteria;
@@ -21,8 +21,8 @@ public class OsVersionCriteria extends EntityCriteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- Path<String> attribute = root.get(Agent.PROP_OS_VERSION);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(Agent.PROP_OS_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/agent/PausedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java
index 46c9f2855e..5b99e53c5a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.agent;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Agent;
import io.onedev.server.search.entity.EntityCriteria;
@@ -13,8 +13,8 @@ public class PausedCriteria extends EntityCriteria<Agent> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- return builder.equal(root.get(Agent.PROP_PAUSED), true);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ return builder.equal(from.get(Agent.PROP_PAUSED), true);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java
index e771cd13b0..d44abc1a9e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java
@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.agent;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Agent;
import io.onedev.server.model.Build;
@@ -26,8 +26,8 @@ public class RanBuildCriteria extends EntityCriteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(Agent.PROP_BUILDS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(Agent.PROP_BUILDS, JoinType.LEFT);
join.on(builder.equal(join, build));
return join.isNotNull();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java
index 9ef4aeb9cf..b4e2166d21 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.Constants;
@@ -23,8 +23,8 @@ public class BranchCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<String> attribute = root.get(Build.PROP_REF_NAME);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(Build.PROP_REF_NAME);
String normalized = Constants.R_HEADS + value.toLowerCase().replace("*", "%");
return builder.like(builder.lower(attribute), normalized);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchIsEmptyCriteria.java
index 9fb4f31ab2..a1cc988440 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchIsEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchIsEmptyCriteria.java
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.Constants;
@@ -16,8 +16,8 @@ public class BranchIsEmptyCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<String> attribute = root.get(Build.PROP_REF_NAME);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(Build.PROP_REF_NAME);
return builder.or(
builder.isNull(attribute),
builder.not(builder.like(attribute, Constants.R_HEADS + "%")));
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.java
index e42a49afdd..da081a1dc2 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
@@ -4,9 +4,9 @@ import java.util.Objects;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
@@ -23,8 +23,8 @@ public class CancelledByCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<User> attribute = root.get(Build.PROP_CANCELLER);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<User> attribute = from.get(Build.PROP_CANCELLER);
return builder.equal(attribute, user);
}
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.java
index 9a217bc3d0..df64812c68 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Build;
@@ -16,9 +16,9 @@ public class CancelledByMeCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
if (User.get() != null) {
- Path<User> attribute = root.get(Build.PROP_CANCELLER);
+ Path<User> attribute = from.get(Build.PROP_CANCELLER);
return builder.equal(attribute, User.get());
} else {
throw new ExplicitException("Please login to perform this query");
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.java
index 66f91e1727..7e9fbfb7ba 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
@@ -2,12 +2,11 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
-
import io.onedev.server.search.entity.EntityCriteria;
public class CancelledCriteria extends EntityCriteria<Build> {
@@ -15,8 +14,8 @@ public class CancelledCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<?> attribute = root.get(Build.PROP_STATUS);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<?> attribute = from.get(Build.PROP_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.java
index 60bdd99273..381c171de7 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
@@ -26,9 +26,9 @@ public class CommitCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<?> projectAttribute = BuildQuery.getPath(root, Build.PROP_PROJECT);
- Path<?> commitAttribute = BuildQuery.getPath(root, Build.PROP_COMMIT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<?> projectAttribute = BuildQuery.getPath(from, Build.PROP_PROJECT);
+ Path<?> commitAttribute = BuildQuery.getPath(from, Build.PROP_COMMIT);
return builder.and(
builder.equal(projectAttribute, project),
builder.equal(commitAttribute, 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.java
index 87ba9685e4..b2ac7448d3 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
@@ -3,10 +3,10 @@ package io.onedev.server.search.entity.build;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.BuildDependence;
@@ -28,8 +28,8 @@ public class DependenciesOfCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(Build.PROP_DEPENDENTS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(Build.PROP_DEPENDENTS, JoinType.LEFT);
join.on(builder.equal(join.get(BuildDependence.PROP_DEPENDENT), build));
return join.isNotNull();
}
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.java
index 12efed2152..713ce5c000 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
@@ -3,10 +3,10 @@ package io.onedev.server.search.entity.build;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.BuildDependence;
@@ -28,8 +28,8 @@ public class DependsOnCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(Build.PROP_DEPENDENCIES, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(Build.PROP_DEPENDENCIES, JoinType.LEFT);
join.on(builder.equal(join.get(BuildDependence.PROP_DEPENDENCY), build));
return join.isNotNull();
}
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.java
index f10bafb374..07ceb9b9a3 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
@@ -2,12 +2,11 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
-
import io.onedev.server.search.entity.EntityCriteria;
public class FailedCriteria extends EntityCriteria<Build> {
@@ -15,8 +14,8 @@ public class FailedCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<?> attribute = root.get(Build.PROP_STATUS);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<?> attribute = from.get(Build.PROP_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.java
index b4e8255af5..022929a797 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
@@ -4,12 +4,11 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
-
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -30,8 +29,8 @@ public class FinishDateCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<Date> attribute = root.get(Build.PROP_FINISH_DATE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<Date> attribute = from.get(Build.PROP_FINISH_DATE);
if (operator == BuildQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
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.java
index 78f642fbe3..6359470c8a 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
@@ -6,9 +6,9 @@ import java.util.HashSet;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
@@ -45,8 +45,8 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<Long> attribute = root.get(Build.PROP_ID);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<Long> attribute = from.get(Build.PROP_ID);
Project project = issue.getProject();
Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(project, issue.getNumber());
Collection<String> descendants = new HashSet<>();
@@ -55,7 +55,7 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
Collection<Long> inBuildIds = buildManager.filterIds(project.getId(), descendants);
return builder.and(
- builder.equal(root.get(Build.PROP_PROJECT), issue.getProject()),
+ builder.equal(from.get(Build.PROP_PROJECT), issue.getProject()),
inManyValues(builder, attribute, inBuildIds, buildManager.getIdsByProject(project.getId())));
}
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.java
index 2f53431f4e..6b067555e1 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.search.entity.EntityCriteria;
@@ -21,8 +21,8 @@ public class JobCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<String> attribute = root.get(Build.PROP_JOB);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(Build.PROP_JOB);
String normalized = jobName.toLowerCase().replace("*", "%");
return builder.like(builder.lower(attribute), normalized);
}
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.java
index 87ef57285c..08d2ab9b1f 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
@@ -3,9 +3,9 @@ package io.onedev.server.search.entity.build;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
@@ -30,8 +30,8 @@ public class NumberCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<Long> attribute = root.get(Build.PROP_NUMBER);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<Long> attribute = from.get(Build.PROP_NUMBER);
Predicate numberPredicate;
if (operator == BuildQueryLexer.Is)
numberPredicate = builder.equal(attribute, number.getNumber());
@@ -40,7 +40,7 @@ public class NumberCriteria extends EntityCriteria<Build> {
else
numberPredicate = builder.lessThan(attribute, number.getNumber());
return builder.and(
- builder.equal(root.get(Build.PROP_PROJECT), number.getProject()),
+ builder.equal(from.get(Build.PROP_PROJECT), number.getProject()),
numberPredicate);
}
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.java
index 1dd347c1f1..88528f9a9b 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
@@ -4,6 +4,7 @@ import java.util.List;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
@@ -26,15 +27,15 @@ public class ParamCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Subquery<BuildParam> paramQuery = query.subquery(BuildParam.class);
- Root<BuildParam> param = paramQuery.from(BuildParam.class);
- paramQuery.select(param);
+ Root<BuildParam> paramRoot = paramQuery.from(BuildParam.class);
+ paramQuery.select(paramRoot);
return builder.exists(paramQuery.where(
- builder.equal(param.get(BuildParam.PROP_BUILD), root),
- builder.equal(param.get(BuildParam.PROP_NAME), name),
- builder.equal(param.get(BuildParam.PROP_VALUE), value)));
+ builder.equal(paramRoot.get(BuildParam.PROP_BUILD), from),
+ builder.equal(paramRoot.get(BuildParam.PROP_NAME), name),
+ builder.equal(paramRoot.get(BuildParam.PROP_VALUE), value)));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.java
index 683807105e..3e37fe0e04 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.java
@@ -4,6 +4,7 @@ import java.util.List;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
@@ -23,15 +24,15 @@ public class ParamIsEmptyCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Subquery<BuildParam> paramQuery = query.subquery(BuildParam.class);
- Root<BuildParam> param = paramQuery.from(BuildParam.class);
- paramQuery.select(param);
+ Root<BuildParam> paramRoot = paramQuery.from(BuildParam.class);
+ paramQuery.select(paramRoot);
return builder.not(builder.exists(paramQuery.where(
- builder.equal(param.get(BuildParam.PROP_BUILD), root),
- builder.equal(param.get(BuildParam.PROP_NAME), name),
- builder.isNotNull(param.get(BuildParam.PROP_VALUE)))));
+ builder.equal(paramRoot.get(BuildParam.PROP_BUILD), from),
+ builder.equal(paramRoot.get(BuildParam.PROP_NAME), name),
+ builder.isNotNull(paramRoot.get(BuildParam.PROP_VALUE)))));
}
@Override
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.java
index 5adb9aa33d..c778b18166 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
@@ -2,12 +2,11 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
-
import io.onedev.server.search.entity.EntityCriteria;
public class PendingCriteria extends EntityCriteria<Build> {
@@ -15,8 +14,8 @@ public class PendingCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<?> attribute = root.get(Build.PROP_STATUS);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<?> attribute = from.get(Build.PROP_STATUS);
return builder.equal(attribute, Build.Status.PENDING);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java
index 491fab3287..c68829aa21 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java
@@ -4,12 +4,11 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
-
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -30,8 +29,8 @@ public class PendingDateCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<Date> attribute = root.get(Build.PROP_PENDING_DATE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<Date> attribute = from.get(Build.PROP_PENDING_DATE);
if (operator == BuildQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java
index fc84f43c29..b795b6823f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
@@ -23,9 +23,9 @@ public class ProjectCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(
- builder, root.join(Build.PROP_PROJECT, JoinType.INNER), projectPath);
+ builder, from.join(Build.PROP_PROJECT, JoinType.INNER), projectPath);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java
index ff796abb85..d3c9dbeb81 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java
@@ -3,9 +3,9 @@ package io.onedev.server.search.entity.build;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
@@ -27,8 +27,8 @@ public class PullRequestCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<PullRequest> attribute = root.get(Build.PROP_PULL_REQUEST);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<PullRequest> attribute = from.get(Build.PROP_PULL_REQUEST);
return builder.equal(attribute, request);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestIsEmptyCriteria.java
index d88f7c0edf..152d939364 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestIsEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestIsEmptyCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.search.entity.EntityCriteria;
@@ -13,8 +13,8 @@ public class PullRequestIsEmptyCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- return builder.isNull(root.get(Build.PROP_PULL_REQUEST));
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ return builder.isNull(from.get(Build.PROP_PULL_REQUEST));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java
index 04cdeb237d..7f74798746 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java
@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
@@ -27,8 +27,8 @@ public class RanOnCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(Build.PROP_AGENT, JoinType.INNER);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(Build.PROP_AGENT, JoinType.INNER);
join.on(builder.equal(join.get(Agent.PROP_NAME), value));
return join.isNotNull();
}
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.java
index 1fa87d37d4..6d8b52caf1 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
@@ -2,12 +2,11 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
-
import io.onedev.server.search.entity.EntityCriteria;
public class RunningCriteria extends EntityCriteria<Build> {
@@ -15,8 +14,8 @@ public class RunningCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<?> attribute = root.get(Build.PROP_STATUS);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<?> attribute = from.get(Build.PROP_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.java
index b6e164fb2a..c0ca12355c 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
@@ -4,12 +4,11 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
-
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -30,8 +29,8 @@ public class RunningDateCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<Date> attribute = root.get(Build.PROP_RUNNING_DATE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<Date> attribute = from.get(Build.PROP_RUNNING_DATE);
if (operator == BuildQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
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.java
index 240e9a446f..ce076c7624 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
@@ -4,9 +4,9 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.search.entity.EntityCriteria;
@@ -29,8 +29,8 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<Date> attribute = root.get(Build.PROP_SUBMIT_DATE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<Date> attribute = from.get(Build.PROP_SUBMIT_DATE);
if (operator == BuildQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
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.java
index 28be93c18b..112095005f 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
@@ -4,9 +4,9 @@ import java.util.Objects;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
@@ -23,8 +23,8 @@ public class SubmittedByCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<User> attribute = root.get(Build.PROP_SUBMITTER);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<User> attribute = from.get(Build.PROP_SUBMITTER);
return builder.equal(attribute, user);
}
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.java
index 65b4a3b9ea..ab9cbe475f 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Build;
@@ -16,9 +16,9 @@ public class SubmittedByMeCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
if (User.get() != null) {
- Path<User> attribute = root.get(Build.PROP_SUBMITTER);
+ Path<User> attribute = from.get(Build.PROP_SUBMITTER);
return builder.equal(attribute, User.get());
} else {
throw new ExplicitException("Please login to perform this query");
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.java
index f0cf1dfd62..0eefa7d0c1 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
@@ -2,12 +2,11 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
-
import io.onedev.server.search.entity.EntityCriteria;
public class SuccessfulCriteria extends EntityCriteria<Build> {
@@ -15,8 +14,8 @@ public class SuccessfulCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<?> attribute = root.get(Build.PROP_STATUS);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<?> attribute = from.get(Build.PROP_STATUS);
return builder.equal(attribute, Build.Status.SUCCESSFUL);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java
index 5dbc3670b2..4908184bc1 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.Constants;
@@ -23,8 +23,8 @@ public class TagCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<String> attribute = root.get(Build.PROP_REF_NAME);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(Build.PROP_REF_NAME);
String normalized = Constants.R_TAGS + value.toLowerCase().replace("*", "%");
return builder.like(builder.lower(attribute), normalized);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TagIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TagIsEmptyCriteria.java
index d83badef11..df0df2f459 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TagIsEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TagIsEmptyCriteria.java
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.Constants;
@@ -16,8 +16,8 @@ public class TagIsEmptyCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<String> attribute = root.get(Build.PROP_REF_NAME);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(Build.PROP_REF_NAME);
return builder.or(
builder.isNull(attribute),
builder.not(builder.like(attribute, Constants.R_TAGS + "%")));
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.java
index 89510ded37..0ee3e67c63 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
@@ -2,12 +2,11 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
-
import io.onedev.server.search.entity.EntityCriteria;
public class TimedOutCriteria extends EntityCriteria<Build> {
@@ -15,8 +14,8 @@ public class TimedOutCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<?> attribute = root.get(Build.PROP_STATUS);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<?> attribute = from.get(Build.PROP_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.java
index 7bc0e94b01..c2e04f8541 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.search.entity.EntityCriteria;
@@ -21,8 +21,8 @@ public class VersionCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<String> attribute = root.get(Build.PROP_VERSION);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(Build.PROP_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/VersionIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionIsEmptyCriteria.java
index ea93363685..283e128339 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionIsEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionIsEmptyCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.search.entity.EntityCriteria;
@@ -13,8 +13,8 @@ public class VersionIsEmptyCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- return builder.isNull(root.get(Build.PROP_VERSION));
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ return builder.isNull(from.get(Build.PROP_VERSION));
}
@Override
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.java
index 4096ca52a1..7b2182a96f 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
@@ -2,12 +2,11 @@ package io.onedev.server.search.entity.build;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
-
import io.onedev.server.search.entity.EntityCriteria;
public class WaitingCriteria extends EntityCriteria<Build> {
@@ -15,8 +14,8 @@ public class WaitingCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {
- Path<?> attribute = root.get(Build.PROP_STATUS);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<?> attribute = from.get(Build.PROP_STATUS);
return builder.equal(attribute, Build.Status.WAITING);
}
diff --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.java
index 8aa898f806..45d3b3bdc7 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
@@ -3,8 +3,8 @@ package io.onedev.server.search.entity.codecomment;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.CodeComment;
import io.onedev.server.search.entity.EntityCriteria;
@@ -21,8 +21,8 @@ public class ContentCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {
- Expression<String> attribute = root.get(CodeComment.PROP_CONTENT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ Expression<String> attribute = from.get(CodeComment.PROP_CONTENT);
return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");
}
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.java
index 0cc052bad5..0e5a8a7674 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
@@ -4,9 +4,9 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.CodeComment;
import io.onedev.server.search.entity.EntityCriteria;
@@ -28,8 +28,8 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {
- Path<Date> attribute = root.get(CodeComment.PROP_CREATE_DATE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ Path<Date> attribute = from.get(CodeComment.PROP_CREATE_DATE);
if (operator == CodeCommentQueryLexer.IsUntil)
return builder.lessThan(attribute, value);
else
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.java
index 5c0f32d774..884d3f20cb 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
@@ -4,9 +4,9 @@ import java.util.Objects;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.User;
@@ -23,8 +23,8 @@ public class CreatedByCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {
- Path<User> attribute = root.get(CodeComment.PROP_USER);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ Path<User> attribute = from.get(CodeComment.PROP_USER);
return builder.equal(attribute, user);
}
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.java
index eefb555c5b..1e79e42856 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.codecomment;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.CodeComment;
@@ -16,9 +16,9 @@ public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
if (User.get() != null) {
- Path<?> attribute = root.get(CodeComment.PROP_USER);
+ Path<?> attribute = from.get(CodeComment.PROP_USER);
return builder.equal(attribute, User.get());
} else {
throw new ExplicitException("Please login to perform this query");
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.java
index 2043e5cb29..c92c2a9f90 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.codecomment;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
@@ -27,9 +27,9 @@ public class OnCommitCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {
- Path<?> projectAttribute = CodeCommentQuery.getPath(root, CodeComment.PROP_PROJECT);
- Path<?> commitAttribute = CodeCommentQuery.getPath(root, CodeComment.PROP_MARK + "." + Mark.PROP_COMMIT_HASH);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ Path<?> projectAttribute = CodeCommentQuery.getPath(from, CodeComment.PROP_PROJECT);
+ Path<?> commitAttribute = CodeCommentQuery.getPath(from, CodeComment.PROP_MARK + "." + Mark.PROP_COMMIT_HASH);
return builder.and(
builder.equal(projectAttribute, project),
builder.equal(commitAttribute, 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.java
index 81c4b09b06..38e69bb1c0 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.codecomment;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.support.Mark;
@@ -22,8 +22,8 @@ public class PathCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {
- Path<String> attribute = CodeCommentQuery.getPath(root, CodeComment.PROP_MARK + "." + Mark.PROP_PATH);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ Path<String> attribute = CodeCommentQuery.getPath(from, CodeComment.PROP_MARK + "." + Mark.PROP_PATH);
String normalized = value.toLowerCase().replace('*', '%');
if (normalized.endsWith("/"))
normalized += "%";
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.java
index d875468286..baec8ff083 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.codecomment;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.CodeComment;
import io.onedev.server.search.entity.EntityCriteria;
@@ -23,8 +23,8 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {
- Path<Integer> attribute = root.get(CodeComment.PROP_REPLY_COUNT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(CodeComment.PROP_REPLY_COUNT);
if (operator == CodeCommentQueryLexer.Is)
return builder.equal(attribute, value);
else if (operator == CodeCommentQueryLexer.IsLessThan)
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.java
index 622639d997..507306357c 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
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.codecomment;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
@@ -24,8 +24,8 @@ public class ReplyCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(CodeComment.PROP_REPLIES, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(CodeComment.PROP_REPLIES, JoinType.LEFT);
Path<String> attribute = join.get(CodeCommentReply.PROP_CONTENT);
join.on(builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%"));
return join.isNotNull();
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.java
index 1fd32c7ee6..3b5aad9714 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
@@ -4,9 +4,9 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.support.LastUpdate;
@@ -29,8 +29,8 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {
- Path<Date> attribute = CodeCommentQuery.getPath(root, CodeComment.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ Path<Date> attribute = CodeCommentQuery.getPath(from, CodeComment.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
if (operator == CodeCommentQueryLexer.IsUntil)
return builder.lessThan(attribute, value);
else
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java
index efef77deeb..217743734a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java
@@ -10,8 +10,8 @@ import java.util.Set;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.search.entity.AndEntityCriteria;
@@ -31,8 +31,8 @@ public class AndIssueCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- return new AndEntityCriteria<Issue>(criterias).getPredicate(query, root, builder);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ return new AndEntityCriteria<Issue>(criterias).getPredicate(query, from, builder);
}
@Override
diff --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.java
index d10dbe5a4a..1d257eea70 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
@@ -3,8 +3,8 @@ package io.onedev.server.search.entity.issue;
import java.util.Objects;
import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
@@ -22,8 +22,8 @@ public class BooleanFieldCriteria extends FieldCriteria {
}
@Override
- public Predicate getValuePredicate(Root<Issue> issue, Root<IssueField> field, CriteriaBuilder builder) {
- return builder.equal(field.get(IssueField.PROP_VALUE), String.valueOf(value));
+ public Predicate getValuePredicate(From<Issue, Issue> issueFrom, From<IssueField, IssueField> fieldFrom, CriteriaBuilder builder) {
+ return builder.equal(fieldFrom.get(IssueField.PROP_VALUE), String.valueOf(value));
}
@Override
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.java
index 498385b534..1cb169d218 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java
@@ -6,8 +6,8 @@ import java.util.Objects;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
@@ -33,8 +33,8 @@ public class BuildFieldCriteria extends FieldCriteria {
}
@Override
- protected Predicate getValuePredicate(Root<Issue> issue, Root<IssueField> field, CriteriaBuilder builder) {
- return builder.equal(field.get(IssueField.PROP_ORDINAL), build.getId());
+ protected Predicate getValuePredicate(From<Issue, Issue> issueFrom, From<IssueField, IssueField> fieldFrom, CriteriaBuilder builder) {
+ return builder.equal(fieldFrom.get(IssueField.PROP_ORDINAL), build.getId());
}
@Override
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.java
index 417b1e9e4e..2280b81093 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
@@ -8,8 +8,8 @@ import java.util.Map;
import java.util.Objects;
import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
@@ -41,15 +41,15 @@ public class ChoiceFieldCriteria extends FieldCriteria {
}
@Override
- protected Predicate getValuePredicate(Root<Issue> issue, Root<IssueField> field, CriteriaBuilder builder) {
+ protected Predicate getValuePredicate(From<Issue, Issue> issueFrom, From<IssueField, IssueField> fieldFrom, CriteriaBuilder builder) {
if (allowMultiple)
- return builder.equal(field.get(IssueField.PROP_VALUE), value);
+ return builder.equal(fieldFrom.get(IssueField.PROP_VALUE), value);
else if (operator == IssueQueryLexer.Is)
- return builder.equal(field.get(IssueField.PROP_VALUE), value);
+ return builder.equal(fieldFrom.get(IssueField.PROP_VALUE), value);
else if (operator == IssueQueryLexer.IsGreaterThan)
- return builder.greaterThan(field.get(IssueField.PROP_ORDINAL), ordinal);
+ return builder.greaterThan(fieldFrom.get(IssueField.PROP_ORDINAL), ordinal);
else
- return builder.lessThan(field.get(IssueField.PROP_ORDINAL), ordinal);
+ return builder.lessThan(fieldFrom.get(IssueField.PROP_ORDINAL), ordinal);
}
@SuppressWarnings("unchecked")
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.java
index 8482ec97d9..3a52945d90 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
@@ -22,8 +22,8 @@ public class CommentCountCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- Path<Integer> attribute = root.get(Issue.PROP_COMMENT_COUNT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(Issue.PROP_COMMENT_COUNT);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
else if (operator == IssueQueryLexer.IsGreaterThan)
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.java
index 36f21cedbc..a6c0adcd4d 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
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
@@ -22,8 +22,8 @@ public class CommentCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(Issue.PROP_COMMENTS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(Issue.PROP_COMMENTS, JoinType.LEFT);
Path<String> attribute = join.get(IssueComment.PATH_CONTENT);
join.on(builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%"));
return join.isNotNull();
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java
index c437338fb3..1ba6a2ba90 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java
@@ -4,8 +4,8 @@ import java.util.Objects;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
@@ -28,10 +28,10 @@ public class CommitFieldCriteria extends FieldCriteria {
}
@Override
- protected Predicate getValuePredicate(Root<Issue> issue, Root<IssueField> field, CriteriaBuilder builder) {
+ protected Predicate getValuePredicate(From<Issue, Issue> issueFrom, From<IssueField, IssueField> fieldFrom, CriteriaBuilder builder) {
return builder.and(
- builder.equal(issue.get(Issue.PROP_PROJECT), commit.getProject()),
- builder.equal(field.get(IssueField.PROP_VALUE), commit.getCommitId().name()));
+ builder.equal(issueFrom.get(Issue.PROP_PROJECT), commit.getProject()),
+ builder.equal(fieldFrom.get(IssueField.PROP_VALUE), commit.getCommitId().name()));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java
new file mode 100644
index 0000000000..6ef9b81f9d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java
@@ -0,0 +1,36 @@
+package io.onedev.server.search.entity.issue;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.Issue;
+
+public class CurrentIssueCriteria extends IssueCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ if (Issue.get() != null)
+ return builder.equal(from, Issue.get());
+ else
+ throw new ExplicitException("No issue in query context");
+ }
+
+ @Override
+ public boolean matches(Issue issue) {
+ if (Issue.get() != null)
+ return Issue.get().equals(issue);
+ else
+ throw new ExplicitException("No issue in query context");
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return IssueQuery.getRuleName(IssueQueryLexer.IsCurrent);
+ }
+
+}
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.java
index ba918d4cf6..ba7c17d193 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
@@ -3,8 +3,8 @@ package io.onedev.server.search.entity.issue;
import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
@@ -28,11 +28,11 @@ public class DateFieldCriteria extends FieldCriteria {
}
@Override
- protected Predicate getValuePredicate(Root<Issue> issue, Root<IssueField> field, CriteriaBuilder builder) {
+ protected Predicate getValuePredicate(From<Issue, Issue> issueFrom, From<IssueField, IssueField> fieldFrom, CriteriaBuilder builder) {
if (operator == IssueQueryLexer.IsUntil)
- return builder.lessThan(field.get(IssueField.PROP_ORDINAL), date.getTime());
+ return builder.lessThan(fieldFrom.get(IssueField.PROP_ORDINAL), date.getTime());
else
- return builder.greaterThan(field.get(IssueField.PROP_ORDINAL), date.getTime());
+ return builder.greaterThan(fieldFrom.get(IssueField.PROP_ORDINAL), date.getTime());
}
@Override
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.java
index a461454c2d..e279461194 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
@@ -3,8 +3,8 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.util.match.WildcardUtils;
@@ -20,8 +20,8 @@ public class DescriptionCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- Expression<String> attribute = root.get(Issue.PROP_DESCRIPTION);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Expression<String> attribute = from.get(Issue.PROP_DESCRIPTION);
return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");
}
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.java
index 68826059e5..56d87c0d08 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
@@ -8,6 +8,7 @@ import java.util.Set;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
@@ -37,21 +38,21 @@ public abstract class FieldCriteria extends IssueCriteria {
}
@Override
- public final Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
+ public final Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Subquery<IssueField> fieldQuery = query.subquery(IssueField.class);
- Root<IssueField> field = fieldQuery.from(IssueField.class);
- fieldQuery.select(field);
+ Root<IssueField> fieldRoot = fieldQuery.from(IssueField.class);
+ fieldQuery.select(fieldRoot);
- Predicate issuePredicate = builder.equal(field.get(IssueField.PROP_ISSUE), root);
- Predicate namePredicate = builder.equal(field.get(IssueField.PROP_NAME), getFieldName());
- Predicate valuePredicate = getValuePredicate(root, field, builder);
+ Predicate issuePredicate = builder.equal(fieldRoot.get(IssueField.PROP_ISSUE), from);
+ Predicate namePredicate = builder.equal(fieldRoot.get(IssueField.PROP_NAME), getFieldName());
+ Predicate valuePredicate = getValuePredicate(from, fieldRoot, builder);
if (valuePredicate != null) {
return builder.exists(fieldQuery.where(issuePredicate, namePredicate, valuePredicate));
} else {
return builder.not(builder.exists(fieldQuery.where(
issuePredicate,
namePredicate,
- builder.isNotNull(field.get(IssueField.PROP_VALUE)))));
+ builder.isNotNull(fieldRoot.get(IssueField.PROP_VALUE)))));
}
}
@@ -59,7 +60,7 @@ public abstract class FieldCriteria extends IssueCriteria {
* @return predicate of field value. <tt>null</tt> to indicate that this field is empty
*/
@Nullable
- protected abstract Predicate getValuePredicate(Root<Issue> issue, Root<IssueField> field, CriteriaBuilder builder);
+ protected abstract Predicate getValuePredicate(From<Issue, Issue> issue, From<IssueField, IssueField> field, CriteriaBuilder builder);
@Override
public 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.java
index bca0a012c1..10fffc81bd 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
@@ -8,9 +8,9 @@ import java.util.Objects;
import java.util.stream.Collectors;
import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Build;
@@ -40,9 +40,9 @@ public class FieldOperatorCriteria extends FieldCriteria {
}
@Override
- protected Predicate getValuePredicate(Root<Issue> issue, Root<IssueField> field, CriteriaBuilder builder) {
- Path<?> valueAttribute = field.get(IssueField.PROP_VALUE);
- Path<?> projectAttribute = issue.get(Issue.PROP_PROJECT);
+ protected Predicate getValuePredicate(From<Issue, Issue> issueFrom, From<IssueField, IssueField> fieldFrom, CriteriaBuilder builder) {
+ Path<?> valueAttribute = fieldFrom.get(IssueField.PROP_VALUE);
+ Path<?> projectAttribute = issueFrom.get(Issue.PROP_PROJECT);
if (operator == IssueQueryLexer.IsEmpty) {
return null;
} else if (operator == IssueQueryLexer.IsMe) {
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.java
index ca61aeafea..37f85c6d47 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
@@ -10,9 +10,9 @@ import java.util.Set;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
@@ -76,7 +76,7 @@ public class FixedBetweenCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Set<Long> fixedIssueNumbers = new HashSet<>();
Repository repository = project.getRepository();
@@ -96,17 +96,17 @@ public class FixedBetweenCriteria extends IssueCriteria {
}
Predicate issuePredicate;
- Path<Long> attribute = root.get(Issue.PROP_NUMBER);
+ Path<Long> attribute = from.get(Issue.PROP_NUMBER);
if (fixedIssueNumbers.size() > IN_CLAUSE_LIMIT) {
Collection<Long> allIssueNumbers = OneDev.getInstance(IssueManager.class).getIssueNumbers(project.getId());
issuePredicate = inManyValues(builder, attribute, fixedIssueNumbers, allIssueNumbers);
} else if (!fixedIssueNumbers.isEmpty()) {
- issuePredicate = root.get(Issue.PROP_NUMBER).in(fixedIssueNumbers);
+ issuePredicate = from.get(Issue.PROP_NUMBER).in(fixedIssueNumbers);
} else {
issuePredicate = builder.disjunction();
}
return builder.and(
- builder.equal(root.get(Issue.PROP_PROJECT), project),
+ builder.equal(from.get(Issue.PROP_PROJECT), project),
issuePredicate);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java
index 14ca773e7a..afc2b44d08 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java
@@ -5,13 +5,12 @@ import java.util.Collection;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-
import io.onedev.server.search.entity.EntityQuery;
public class FixedInBuildCriteria extends IssueCriteria {
@@ -29,16 +28,16 @@ public class FixedInBuildCriteria extends IssueCriteria {
public FixedInBuildCriteria(Build build) {
this.build = build;
- value = String.valueOf(build.getNumber());
+ value = build.getFQN().toString();
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Collection<Long> fixedIssueNumbers = build.getFixedIssueNumbers();
if (!fixedIssueNumbers.isEmpty()) {
return builder.and(
- builder.equal(root.get(Issue.PROP_PROJECT), build.getProject()),
- root.get(Issue.PROP_NUMBER).in(fixedIssueNumbers));
+ builder.equal(from.get(Issue.PROP_PROJECT), build.getProject()),
+ from.get(Issue.PROP_NUMBER).in(fixedIssueNumbers));
} else {
return builder.disjunction();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java
index ae71f02687..c9de906706 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java
@@ -3,8 +3,8 @@ package io.onedev.server.search.entity.issue;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -30,11 +30,11 @@ public class FixedInCommitCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (!commit.getFixedIssueNumbers().isEmpty()) {
return builder.and(
- builder.equal(root.get(Issue.PROP_PROJECT), commit.getProject()),
- root.get(Issue.PROP_NUMBER).in(commit.getFixedIssueNumbers()));
+ builder.equal(from.get(Issue.PROP_PROJECT), commit.getProject()),
+ from.get(Issue.PROP_NUMBER).in(commit.getFixedIssueNumbers()));
} else {
return builder.disjunction();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java
index 45008b13ae..7e84401332 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Build;
@@ -14,9 +14,9 @@ public class FixedInCurrentBuildCriteria extends IssueCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (Build.get() != null)
- return new FixedInBuildCriteria(Build.get()).getPredicate(query, root, builder);
+ return new FixedInBuildCriteria(Build.get()).getPredicate(query, from, builder);
else
throw new ExplicitException("No build in query context");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java
index fd0fda0de3..7baea6e3c9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Issue;
@@ -14,9 +14,9 @@ public class FixedInCurrentCommitCriteria extends IssueCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (ProjectScopedCommit.get() != null)
- return new FixedInCommitCriteria(ProjectScopedCommit.get()).getPredicate(query, root, builder);
+ return new FixedInCommitCriteria(ProjectScopedCommit.get()).getPredicate(query, from, builder);
else
throw new ExplicitException("No commit id in query context");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java
index f50d5db194..11807497bd 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Issue;
@@ -14,9 +14,9 @@ public class FixedInCurrentPullRequestCriteria extends IssueCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (PullRequest.get() != null)
- return new FixedInPullRequestCriteria(PullRequest.get()).getPredicate(query, root, builder);
+ return new FixedInPullRequestCriteria(PullRequest.get()).getPredicate(query, from, builder);
else
throw new ExplicitException("No pull request in query context");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java
index 33300be925..afd066b99b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java
@@ -5,8 +5,8 @@ import java.util.Collection;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -28,16 +28,16 @@ public class FixedInPullRequestCriteria extends IssueCriteria {
public FixedInPullRequestCriteria(PullRequest request) {
this.request = request;
- value = String.valueOf(request.getNumber());
+ value = request.getFQN().toString();
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Collection<Long> fixedIssueNumbers = request.getFixedIssueNumbers();
if (!fixedIssueNumbers.isEmpty()) {
return builder.and(
- builder.equal(root.get(Issue.PROP_PROJECT), request.getTargetProject()),
- root.get(Issue.PROP_NUMBER).in(fixedIssueNumbers));
+ builder.equal(from.get(Issue.PROP_PROJECT), request.getTargetProject()),
+ from.get(Issue.PROP_NUMBER).in(fixedIssueNumbers));
} else {
return builder.disjunction();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
new file mode 100644
index 0000000000..1c78ae404c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
@@ -0,0 +1,68 @@
+package io.onedev.server.search.entity.issue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueLink;
+import io.onedev.server.model.LinkSpec;
+
+public class HasLinkCriteria extends IssueCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final LinkSpec linkSpec;
+
+ private final boolean opposite;
+
+ public HasLinkCriteria(LinkSpec linkSpec, boolean opposite) {
+ this.linkSpec = linkSpec;
+ this.opposite = opposite;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Subquery<IssueLink> linkQuery = query.subquery(IssueLink.class);
+ Root<IssueLink> linkRoot = linkQuery.from(IssueLink.class);
+ linkQuery.select(linkRoot);
+
+ List<Predicate> predicates = new ArrayList<>();
+ predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_SPEC), linkSpec));
+
+ if (opposite) {
+ predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_TARGET), from));
+ } else if (linkSpec.getOpposite() != null) {
+ predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_SOURCE), from));
+ } else {
+ predicates.add(builder.or(
+ builder.equal(linkRoot.get(IssueLink.PROP_SOURCE), from),
+ builder.equal(linkRoot.get(IssueLink.PROP_TARGET), from))
+ );
+ }
+
+ return builder.exists(linkQuery.where(builder.and(predicates.toArray(new Predicate[0]))));
+ }
+
+ @Override
+ public boolean matches(Issue issue) {
+ if (opposite)
+ return issue.getSourceLinks().stream().anyMatch(it->it.getSpec().equals(linkSpec));
+ else if (linkSpec.getOpposite() != null)
+ return issue.getTargetLinks().stream().anyMatch(it->it.getSpec().equals(linkSpec));
+ else
+ return issue.getLinks().stream().anyMatch(it->it.getSpec().equals(linkSpec));
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return IssueQuery.getRuleName(IssueQueryLexer.HasAny) + " " + quote(linkSpec.getName(opposite));
+ }
+
+}
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.java
index 832b3677bf..4f2446c8f1 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java
@@ -4,8 +4,8 @@ import java.util.Objects;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
@@ -27,8 +27,9 @@ public class IssueFieldCriteria extends FieldCriteria {
}
@Override
- protected Predicate getValuePredicate(Root<Issue> issue, Root<IssueField> field, CriteriaBuilder builder) {
- return builder.equal(field.get(IssueField.PROP_ORDINAL), IssueFieldCriteria.this.issue.getId());
+ protected Predicate getValuePredicate(From<Issue, Issue> issueFrom, From<IssueField, IssueField> fieldFrom,
+ CriteriaBuilder builder) {
+ return builder.equal(fieldFrom.get(IssueField.PROP_ORDINAL), IssueFieldCriteria.this.issue.getId());
}
@Override
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.g4
index 1c7d629796..cd1ed4527c 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,21 +7,22 @@ query
;
criteria
- : operator=(SubmittedByMe|FixedInCurrentCommit|FixedInCurrentBuild|FixedInCurrentPullRequest) #OperatorCriteria
- | operator=(SubmittedBy|FixedInCommit|FixedInBuild|FixedInPullRequest) WS+ criteriaValue=Quoted #OperatorValueCriteria
+ : operator=(SubmittedByMe|FixedInCurrentCommit|FixedInCurrentBuild|FixedInCurrentPullRequest|CurrentIssue) #OperatorCriteria
+ | operator=(SubmittedBy|FixedInCommit|FixedInBuild|FixedInPullRequest|HasAny) WS+ criteriaValue=Quoted #OperatorValueCriteria
| FixedBetween WS+ revisionCriteria WS+ And WS+ revisionCriteria #FixedBetweenCriteria
| criteriaField=Quoted WS+ operator=(IsMe|IsEmpty|IsCurrent|IsPrevious) #FieldOperatorCriteria
| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
| criteria WS+ Or WS+ criteria #OrCriteria
- | Not WS* LParens WS* criteria WS* RParens #NotCriteria
+ | Not WS* LParens WS* criteria WS* RParens #NotCriteria
+ | scope=(Any|All) WS+ linkSpec=Quoted WS+ Matching WS* LParens WS* criteria WS* RParens #LinkMatchCriteria
| LParens WS* criteria WS* RParens #ParensCriteria
;
revisionCriteria
- : revisionType=(Build|Branch|Tag|Commit) WS+ revisionValue=Quoted
+ : revisionType=(Build|Branch|Tag|Commit) WS+ revisionValue=Quoted
;
-
+
order
: orderField=Quoted WS* (WS+ direction=(Asc|Desc))?
;
@@ -33,18 +34,18 @@ OrderBy
SubmittedBy
: 'submitted' WS+ 'by'
;
-
+
FixedInCommit
: 'fixed' WS+ 'in' WS+ 'commit'
- ;
+ ;
FixedInCurrentCommit
: 'fixed' WS+ 'in' WS+ 'current' WS+ 'commit'
;
-
+
FixedInBuild
: 'fixed' WS+ 'in' WS+ 'build'
- ;
+ ;
FixedInCurrentBuild
: 'fixed' WS+ 'in' WS+ 'current' WS+ 'build'
@@ -52,28 +53,32 @@ FixedInCurrentBuild
FixedInPullRequest
: 'fixed' WS+ 'in' WS+ 'pull' WS+ 'request'
- ;
+ ;
FixedInCurrentPullRequest
: 'fixed' WS+ 'in' WS+ 'current' WS+ 'pull' WS+ 'request'
;
IsCurrent
- : 'is' WS+ 'current'
+ : 'is' WS+ 'current'
;
-
+
IsPrevious
: 'is' WS+ 'previous'
;
-
+
FixedBetween
- : 'fixed' WS+ 'between'
+ : 'fixed' WS+ 'between'
;
SubmittedByMe
: 'submitted' WS+ 'by' WS+ 'me'
;
-
+
+CurrentIssue
+ : 'current' WS+ 'issue'
+ ;
+
Is
: 'is'
;
@@ -81,7 +86,7 @@ Is
IsMe
: 'is' WS+ 'me'
;
-
+
Contains
: 'contains'
;
@@ -109,55 +114,71 @@ IsEmpty
Build
: 'build'
;
-
+
Branch
: 'branch'
;
-
+
Tag
: 'tag'
;
-
+
Commit
: 'commit'
;
-
+
And
: 'and'
;
-
+
Or
: 'or'
;
-
+
Not
: 'not'
;
+
+Any
+ : 'any'
+ ;
+
+All
+ : 'all'
+ ;
+HasAny
+ : 'has' WS+ 'any'
+ ;
+
+Matching
+ : 'matching'
+ ;
+
Asc
: 'asc'
;
-
+
Desc
: 'desc'
- ;
-
+ ;
+
LParens
: '('
;
-
+
RParens
: ')'
- ;
+ ;
Quoted
: '"' ('\\'.|~[\\"])+? '"'
;
-
+
WS
: ' '
;
Identifier
: [a-zA-Z0-9:_/\\+\-;]+
- ;
+ ;
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.java
index 7499489773..16f99fed3c 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
@@ -20,7 +20,6 @@ import org.antlr.v4.runtime.Recognizer;
import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueSchedule;
@@ -34,8 +33,8 @@ import io.onedev.server.model.support.issue.field.spec.CommitField;
import io.onedev.server.model.support.issue.field.spec.DateField;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;
-import io.onedev.server.model.support.issue.field.spec.IssueChoiceField;
import io.onedev.server.model.support.issue.field.spec.IntegerField;
+import io.onedev.server.model.support.issue.field.spec.IssueChoiceField;
import io.onedev.server.model.support.issue.field.spec.PullRequestChoiceField;
import io.onedev.server.model.support.issue.field.spec.TextField;
import io.onedev.server.model.support.issue.field.spec.UserChoiceField;
@@ -47,6 +46,7 @@ import io.onedev.server.search.entity.issue.IssueQueryParser.CriteriaContext;
import io.onedev.server.search.entity.issue.IssueQueryParser.FieldOperatorCriteriaContext;
import io.onedev.server.search.entity.issue.IssueQueryParser.FieldOperatorValueCriteriaContext;
import io.onedev.server.search.entity.issue.IssueQueryParser.FixedBetweenCriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.LinkMatchCriteriaContext;
import io.onedev.server.search.entity.issue.IssueQueryParser.NotCriteriaContext;
import io.onedev.server.search.entity.issue.IssueQueryParser.OperatorCriteriaContext;
import io.onedev.server.search.entity.issue.IssueQueryParser.OperatorValueCriteriaContext;
@@ -94,7 +94,8 @@ public class IssueQuery extends EntityQuery<Issue> {
public static IssueQuery parse(@Nullable Project project, @Nullable String queryString,
boolean validate, boolean withCurrentUserCriteria, boolean withCurrentBuildCriteria,
- boolean withCurrentPullRequestCriteria, boolean withCurrentCommitCriteria) {
+ boolean withCurrentPullRequestCriteria, boolean withCurrentCommitCriteria,
+ boolean withCurrentIssueCriteria) {
if (queryString != null) {
CharStream is = CharStreams.fromString(queryString);
IssueQueryLexer lexer = new IssueQueryLexer(is);
@@ -143,6 +144,10 @@ public class IssueQuery extends EntityQuery<Issue> {
if (!withCurrentCommitCriteria)
throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");
return new FixedInCurrentCommitCriteria();
+ case IssueQueryLexer.CurrentIssue:
+ if (!withCurrentIssueCriteria)
+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");
+ return new CurrentIssueCriteria();
default:
throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());
}
@@ -154,36 +159,45 @@ public class IssueQuery extends EntityQuery<Issue> {
int operator = ctx.operator.getType();
if (validate) {
checkField(fieldName, operator, withCurrentUserCriteria, withCurrentBuildCriteria,
- withCurrentPullRequestCriteria, withCurrentCommitCriteria);
+ withCurrentPullRequestCriteria, withCurrentCommitCriteria, withCurrentIssueCriteria);
}
if (fieldName.equals(IssueSchedule.NAME_MILESTONE)) {
return new MilestoneIsEmptyCriteria();
} else {
- LinkSpec linkSpec = getLinkSpecManager().find(fieldName);
- if (linkSpec != null) {
- return new LinkIsEmptyCriteria(linkSpec, !fieldName.equals(linkSpec.getName()));
- } else {
- FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);
- if (fieldSpec != null)
- return new FieldOperatorCriteria(fieldName, operator, fieldSpec.isAllowMultiple());
- else
- return new FieldOperatorCriteria(fieldName, operator, false);
- }
+ FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);
+ if (fieldSpec != null)
+ return new FieldOperatorCriteria(fieldName, operator, fieldSpec.isAllowMultiple());
+ else
+ return new FieldOperatorCriteria(fieldName, operator, false);
}
}
+ @Override
+ public IssueCriteria visitLinkMatchCriteria(LinkMatchCriteriaContext ctx) {
+ String linkName = getValue(ctx.Quoted().getText());
+ LinkSpec linkSpec = getLinkSpec(linkName);
+ boolean opposite = !linkName.equals(linkSpec.getName());
+ boolean allMatch = ctx.All() != null;
+ IssueCriteria criteria = visit(ctx.criteria());
+ return new LinkMatchCriteria(linkSpec, opposite, criteria, allMatch);
+ }
+
public IssueCriteria visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {
String value = getValue(ctx.Quoted().getText());
- if (ctx.SubmittedBy() != null)
+ if (ctx.SubmittedBy() != null) {
return new SubmittedByCriteria(getUser(value));
- else if (ctx.FixedInBuild() != null)
+ } else if (ctx.FixedInBuild() != null) {
return new FixedInBuildCriteria(project, value);
- else if (ctx.FixedInPullRequest() != null)
+ } else if (ctx.FixedInPullRequest() != null) {
return new FixedInPullRequestCriteria(project, value);
- else if (ctx.FixedInCommit() != null)
+ } else if (ctx.FixedInCommit() != null) {
return new FixedInCommitCriteria(project, value);
- else
+ } else if (ctx.HasAny() != null) {
+ LinkSpec linkSpec = getLinkSpec(value);
+ return new HasLinkCriteria(linkSpec, !value.equals(linkSpec.getName()));
+ } else {
throw new RuntimeException("Unexpected operator: " + ctx.operator.getText());
+ }
}
@Override
@@ -211,7 +225,7 @@ public class IssueQuery extends EntityQuery<Issue> {
int operator = ctx.operator.getType();
if (validate) {
checkField(fieldName, operator, withCurrentUserCriteria, withCurrentBuildCriteria,
- withCurrentPullRequestCriteria, withCurrentCommitCriteria);
+ withCurrentPullRequestCriteria, withCurrentCommitCriteria, withCurrentIssueCriteria);
}
switch (operator) {
@@ -245,32 +259,27 @@ public class IssueQuery extends EntityQuery<Issue> {
} else if (fieldName.equals(Issue.NAME_NUMBER)) {
return new NumberCriteria(project, value, operator);
} else {
- LinkSpec link = getLinkSpecManager().find(fieldName);
- if (link != null) {
- return new LinkCriteria(link, !fieldName.equals(link.getName()), project, value);
+ FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);
+ if (field instanceof IssueChoiceField) {
+ return new IssueFieldCriteria(fieldName, project, value);
+ } else if (field instanceof BuildChoiceField) {
+ return new BuildFieldCriteria(fieldName, project, value, field.isAllowMultiple());
+ } else if (field instanceof PullRequestChoiceField) {
+ return new PullRequestFieldCriteria(fieldName, project, value);
+ } else if (field instanceof CommitField) {
+ return new CommitFieldCriteria(fieldName, project, value);
+ } else if (field instanceof BooleanField) {
+ return new BooleanFieldCriteria(fieldName, getBooleanValue(value));
+ } else if (field instanceof IntegerField) {
+ return new NumericFieldCriteria(fieldName, getIntValue(value), operator);
+ } else if (field instanceof ChoiceField) {
+ long ordinal = getValueOrdinal((ChoiceField) field, value);
+ return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, field.isAllowMultiple());
+ } else if (field instanceof UserChoiceField
+ || field instanceof GroupChoiceField) {
+ return new ChoiceFieldCriteria(fieldName, value, -1, operator, field.isAllowMultiple());
} else {
- FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);
- if (field instanceof IssueChoiceField) {
- return new IssueFieldCriteria(fieldName, project, value);
- } else if (field instanceof BuildChoiceField) {
- return new BuildFieldCriteria(fieldName, project, value, field.isAllowMultiple());
- } else if (field instanceof PullRequestChoiceField) {
- return new PullRequestFieldCriteria(fieldName, project, value);
- } else if (field instanceof CommitField) {
- return new CommitFieldCriteria(fieldName, project, value);
- } else if (field instanceof BooleanField) {
- return new BooleanFieldCriteria(fieldName, getBooleanValue(value));
- } else if (field instanceof IntegerField) {
- return new NumericFieldCriteria(fieldName, getIntValue(value), operator);
- } else if (field instanceof ChoiceField) {
- long ordinal = getValueOrdinal((ChoiceField) field, value);
- return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, field.isAllowMultiple());
- } else if (field instanceof UserChoiceField
- || field instanceof GroupChoiceField) {
- return new ChoiceFieldCriteria(fieldName, value, -1, operator, field.isAllowMultiple());
- } else {
- return new StringFieldCriteria(fieldName, value, operator);
- }
+ return new StringFieldCriteria(fieldName, value, operator);
}
}
case IssueQueryLexer.IsLessThan:
@@ -358,20 +367,16 @@ public class IssueQuery extends EntityQuery<Issue> {
return OneDev.getInstance(SettingManager.class).getIssueSetting();
}
- private static LinkSpecManager getLinkSpecManager() {
- return OneDev.getInstance(LinkSpecManager.class);
- }
-
private static ExplicitException newOperatorException(String fieldName, int operator) {
return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");
}
public static void checkField(String fieldName, int operator,
boolean withCurrentUserCriteria, boolean withCurrentBuildCriteria,
- boolean withCurrentPullRequestCriteria, boolean withCurrentCommitCriteria) {
+ boolean withCurrentPullRequestCriteria, boolean withCurrentCommitCriteria,
+ boolean withCurrentIssueCriteria) {
FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);
- LinkSpec linkSpec = getLinkSpecManager().find(fieldName);
- if (fieldSpec == null && linkSpec == null && !Issue.QUERY_FIELDS.contains(fieldName))
+ if (fieldSpec == null && !Issue.QUERY_FIELDS.contains(fieldName))
throw new ExplicitException("Field not found: " + fieldName);
switch (operator) {
case IssueQueryLexer.IsEmpty:
@@ -417,7 +422,6 @@ public class IssueQuery extends EntityQuery<Issue> {
&& !fieldName.equals(Issue.NAME_COMMENT_COUNT)
&& !fieldName.equals(Issue.NAME_NUMBER)
&& !fieldName.equals(IssueSchedule.NAME_MILESTONE)
- && linkSpec == null
&& !(fieldSpec instanceof IssueChoiceField)
&& !(fieldSpec instanceof PullRequestChoiceField)
&& !(fieldSpec instanceof BuildChoiceField)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkCriteria.java
deleted file mode 100644
index f35e2233ee..0000000000
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkCriteria.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package io.onedev.server.search.entity.issue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Subquery;
-
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueLink;
-import io.onedev.server.model.LinkSpec;
-import io.onedev.server.model.Project;
-import io.onedev.server.search.entity.EntityQuery;
-
-public class LinkCriteria extends IssueCriteria {
-
- private static final long serialVersionUID = 1L;
-
- private final LinkSpec linkSpec;
-
- private final boolean opposite;
-
- private final Issue issue;
-
- private final String value;
-
- public LinkCriteria(LinkSpec linkSpec, boolean opposite, @Nullable Project project, String value) {
- this.linkSpec = linkSpec;
- this.opposite = opposite;
- issue = EntityQuery.getIssue(project, value);
- this.value = value;
- }
-
- @Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- Subquery<IssueLink> linkQuery = query.subquery(IssueLink.class);
- Root<IssueLink> link = linkQuery.from(IssueLink.class);
- linkQuery.select(link);
-
- List<Predicate> predicates = new ArrayList<>();
- predicates.add(builder.equal(link.get(IssueLink.PROP_SPEC), linkSpec));
-
- if (opposite) {
- predicates.add(builder.equal(link.get(IssueLink.PROP_TARGET), root));
- predicates.add(builder.equal(link.get(IssueLink.PROP_SOURCE), issue));
- } else if (linkSpec.getOpposite() != null) {
- predicates.add(builder.equal(link.get(IssueLink.PROP_SOURCE), root));
- predicates.add(builder.equal(link.get(IssueLink.PROP_TARGET), issue));
- } else {
- predicates.add(builder.or(
- builder.and(
- builder.equal(link.get(IssueLink.PROP_SOURCE), root),
- builder.equal(link.get(IssueLink.PROP_TARGET), issue)),
- builder.and(
- builder.equal(link.get(IssueLink.PROP_SOURCE), issue),
- builder.equal(link.get(IssueLink.PROP_TARGET), root))
- ));
- }
-
- return builder.exists(linkQuery.where(builder.and(predicates.toArray(new Predicate[0]))));
- }
-
- @Override
- public boolean matches(Issue issue) {
- if (opposite) {
- for (IssueLink link: issue.getSourceLinks()) {
- if (link.getSpec().equals(linkSpec) && link.getSource().equals(LinkCriteria.this.issue))
- return true;
- }
- return false;
- } else if (linkSpec.getOpposite() != null) {
- for (IssueLink link: issue.getTargetLinks()) {
- if (link.getSpec().equals(linkSpec) && link.getTarget().equals(LinkCriteria.this.issue))
- return true;
- }
- return false;
- } else {
- for (IssueLink link: issue.getLinks()) {
- if (link.getSpec().equals(linkSpec) && link.getLinked(issue).equals(LinkCriteria.this.issue))
- return true;
- }
- return false;
- }
- }
-
- @Override
- public String toStringWithoutParens() {
- return quote(linkSpec.getName(opposite)) + " "
- + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
- + quote(value);
- }
-
- @Override
- public void fill(Issue issue) {
- IssueLink link = new IssueLink();
- link.setSpec(linkSpec);
- if (opposite) {
- link.setTarget(issue);
- link.setSource(LinkCriteria.this.issue);
- issue.getSourceLinks().add(link);
- } else {
- link.setSource(issue);
- link.setTarget(LinkCriteria.this.issue);
- issue.getTargetLinks().add(link);
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkIsEmptyCriteria.java
deleted file mode 100644
index f05c5681f5..0000000000
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkIsEmptyCriteria.java
+++ /dev/null
@@ -1,67 +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.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Subquery;
-
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueLink;
-import io.onedev.server.model.LinkSpec;
-
-public class LinkIsEmptyCriteria extends IssueCriteria {
-
- private static final long serialVersionUID = 1L;
-
- private final LinkSpec linkSpec;
-
- private final boolean opposite;
-
- public LinkIsEmptyCriteria(LinkSpec linkSpec, boolean opposite) {
- this.linkSpec = linkSpec;
- this.opposite = opposite;
- }
-
- @Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- Subquery<IssueLink> linkQuery = query.subquery(IssueLink.class);
- Root<IssueLink> link = linkQuery.from(IssueLink.class);
- linkQuery.select(link);
-
- List<Predicate> predicates = new ArrayList<>();
- predicates.add(builder.equal(link.get(IssueLink.PROP_SPEC), linkSpec));
-
- if (opposite) {
- predicates.add(builder.equal(link.get(IssueLink.PROP_TARGET), root));
- } else if (linkSpec.getOpposite() != null) {
- predicates.add(builder.equal(link.get(IssueLink.PROP_SOURCE), root));
- } else {
- predicates.add(builder.or(
- builder.equal(link.get(IssueLink.PROP_SOURCE), root),
- builder.equal(link.get(IssueLink.PROP_TARGET), root))
- );
- }
-
- return builder.not(builder.exists(linkQuery.where(builder.and(predicates.toArray(new Predicate[0])))));
- }
-
- @Override
- public boolean matches(Issue issue) {
- if (opposite)
- return !issue.getSourceLinks().stream().anyMatch(it->it.getSpec().equals(linkSpec));
- else if (linkSpec.getOpposite() != null)
- return !issue.getTargetLinks().stream().anyMatch(it->it.getSpec().equals(linkSpec));
- else
- return !issue.getLinks().stream().anyMatch(it->it.getSpec().equals(linkSpec));
- }
-
- @Override
- public String toStringWithoutParens() {
- return quote(linkSpec.getName(opposite)) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
new file mode 100644
index 0000000000..c4e93c89bb
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
@@ -0,0 +1,163 @@
+package io.onedev.server.search.entity.issue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueLink;
+import io.onedev.server.model.LinkSpec;
+
+public class LinkMatchCriteria extends IssueCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final LinkSpec linkSpec;
+
+ private final boolean opposite;
+
+ private final IssueCriteria criteria;
+
+ private final boolean allMatch;
+
+ public LinkMatchCriteria(LinkSpec linkSpec, boolean opposite, IssueCriteria criteria, boolean allMatch) {
+ this.linkSpec = linkSpec;
+ this.opposite = opposite;
+ this.criteria = criteria;
+ this.allMatch = allMatch;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Subquery<IssueLink> linkQuery = query.subquery(IssueLink.class);
+ Root<IssueLink> linkRoot = linkQuery.from(IssueLink.class);
+ linkQuery.select(linkRoot);
+
+ List<Predicate> predicates = new ArrayList<>();
+ predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_SPEC), linkSpec));
+
+ if (allMatch) {
+ if (opposite) {
+ predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_TARGET), from));
+ Join<Issue, Issue> linkSourceJoin = linkRoot.join(IssueLink.PROP_SOURCE, JoinType.INNER);
+ predicates.add(builder.not(criteria.getPredicate(query, linkSourceJoin, builder)));
+ } else if (linkSpec.getOpposite() != null) {
+ predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_SOURCE), from));
+ Join<Issue, Issue> linkTargetJoin = linkRoot.join(IssueLink.PROP_TARGET, JoinType.INNER);
+ predicates.add(builder.not(criteria.getPredicate(query, linkTargetJoin, builder)));
+ } else {
+ Join<Issue, Issue> linkSourceJoin = linkRoot.join(IssueLink.PROP_SOURCE, JoinType.INNER);
+ Join<Issue, Issue> linkTargetJoin = linkRoot.join(IssueLink.PROP_TARGET, JoinType.INNER);
+ predicates.add(builder.or(
+ builder.and(
+ builder.equal(linkRoot.get(IssueLink.PROP_SOURCE), from),
+ builder.not(criteria.getPredicate(query, linkTargetJoin, builder))),
+ builder.and(
+ builder.equal(linkRoot.get(IssueLink.PROP_TARGET), from),
+ builder.not(criteria.getPredicate(query, linkSourceJoin, builder)))
+ ));
+ }
+
+ return builder.and(
+ builder.not(builder.exists(linkQuery.where(builder.and(predicates.toArray(new Predicate[0]))))),
+ new HasLinkCriteria(linkSpec, opposite).getPredicate(query, from, builder));
+ } else {
+ if (opposite) {
+ predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_TARGET), from));
+ Join<Issue, Issue> linkSourceJoin = linkRoot.join(IssueLink.PROP_SOURCE, JoinType.INNER);
+ predicates.add(criteria.getPredicate(query, linkSourceJoin, builder));
+ } else if (linkSpec.getOpposite() != null) {
+ predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_SOURCE), from));
+ Join<Issue, Issue> linkTargetJoin = linkRoot.join(IssueLink.PROP_TARGET, JoinType.INNER);
+ predicates.add(criteria.getPredicate(query, linkTargetJoin, builder));
+ } else {
+ Join<Issue, Issue> linkSourceJoin = linkRoot.join(IssueLink.PROP_SOURCE, JoinType.INNER);
+ Join<Issue, Issue> linkTargetJoin = linkRoot.join(IssueLink.PROP_TARGET, JoinType.INNER);
+ predicates.add(builder.or(
+ builder.and(
+ builder.equal(linkRoot.get(IssueLink.PROP_SOURCE), from),
+ criteria.getPredicate(query, linkTargetJoin, builder)),
+ builder.and(
+ builder.equal(linkRoot.get(IssueLink.PROP_TARGET), from),
+ criteria.getPredicate(query, linkSourceJoin, builder))
+ ));
+ }
+
+ return builder.exists(linkQuery.where(builder.and(predicates.toArray(new Predicate[0]))));
+ }
+ }
+
+ @Override
+ public boolean matches(Issue issue) {
+ if (allMatch) {
+ if (opposite) {
+ boolean hasLink = false;
+ for (IssueLink link: issue.getSourceLinks()) {
+ if (link.getSpec().equals(linkSpec)) {
+ hasLink = true;
+ if (!criteria.matches(link.getSource()))
+ return false;
+ }
+ }
+ return hasLink;
+ } else if (linkSpec.getOpposite() != null) {
+ boolean hasLink = false;
+ for (IssueLink link: issue.getTargetLinks()) {
+ if (link.getSpec().equals(linkSpec)) {
+ hasLink = true;
+ if (!criteria.matches(link.getTarget()))
+ return false;
+ }
+ }
+ return hasLink;
+ } else {
+ boolean hasLink = false;
+ for (IssueLink link: issue.getLinks()) {
+ if (link.getSpec().equals(linkSpec)) {
+ hasLink = true;
+ if (!criteria.matches(link.getLinked(issue)))
+ return false;
+ }
+ }
+ return hasLink;
+ }
+ } else {
+ if (opposite) {
+ for (IssueLink link: issue.getSourceLinks()) {
+ if (link.getSpec().equals(linkSpec) && criteria.matches(link.getSource()))
+ return true;
+ }
+ return false;
+ } else if (linkSpec.getOpposite() != null) {
+ for (IssueLink link: issue.getTargetLinks()) {
+ if (link.getSpec().equals(linkSpec) && criteria.matches(link.getTarget()))
+ return true;
+ }
+ return false;
+ } else {
+ for (IssueLink link: issue.getLinks()) {
+ if (link.getSpec().equals(linkSpec) && criteria.matches(link.getLinked(issue)))
+ return true;
+ }
+ return false;
+ }
+ }
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return allMatch?IssueQuery.getRuleName(IssueQueryLexer.All):IssueQuery.getRuleName(IssueQueryLexer.Any)
+ + quote(linkSpec.getName(opposite)) + " "
+ + IssueQuery.getRuleName(IssueQueryLexer.Matching)
+ + "(" + criteria.toString() + ")";
+ }
+
+}
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.java
index 075e603ee7..8d96184c4d 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
@@ -24,13 +25,13 @@ public class MilestoneCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Subquery<IssueSchedule> scheduleQuery = query.subquery(IssueSchedule.class);
Root<IssueSchedule> schedule = scheduleQuery.from(IssueSchedule.class);
scheduleQuery.select(schedule);
Join<?, ?> milestoneJoin = schedule.join(IssueSchedule.PROP_MILESTONE, JoinType.INNER);
scheduleQuery.where(builder.and(
- builder.equal(schedule.get(IssueSchedule.PROP_ISSUE), root),
+ builder.equal(schedule.get(IssueSchedule.PROP_ISSUE), from),
builder.like(milestoneJoin.get(Milestone.PROP_NAME), milestoneName.replace("*", "%"))));
return builder.exists(scheduleQuery);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java
index 4b14d34bf3..4a48ccde1c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueSchedule;
@@ -13,8 +13,8 @@ public class MilestoneIsEmptyCriteria extends IssueCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- return builder.isEmpty(root.get(Issue.PROP_SCHEDULES));
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ return builder.isEmpty(from.get(Issue.PROP_SCHEDULES));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.java
index b731863bf5..6053a86f7d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.java
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.search.entity.NotEntityCriteria;
@@ -26,8 +26,8 @@ public class NotIssueCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- return new NotEntityCriteria<Issue>(criteria).getPredicate(query, root, builder);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ return new NotEntityCriteria<Issue>(criteria).getPredicate(query, from, builder);
}
@Override
diff --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.java
index 9772e6ad85..daa71be7a2 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
@@ -3,13 +3,12 @@ package io.onedev.server.search.entity.issue;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
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.search.entity.EntityQuery;
import io.onedev.server.util.ProjectScopedNumber;
@@ -30,8 +29,8 @@ public class NumberCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- Path<Long> attribute = root.get(Issue.PROP_NUMBER);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<Long> attribute = from.get(Issue.PROP_NUMBER);
Predicate numberPredicate;
if (operator == IssueQueryLexer.Is)
@@ -42,7 +41,7 @@ public class NumberCriteria extends IssueCriteria {
numberPredicate = builder.lessThan(attribute, number.getNumber());
return builder.and(
- builder.equal(root.get(Issue.PROP_PROJECT), number.getProject()),
+ builder.equal(from.get(Issue.PROP_PROJECT), number.getProject()),
numberPredicate);
}
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.java
index f368007280..420651d199 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
@@ -3,9 +3,9 @@ package io.onedev.server.search.entity.issue;
import java.util.Objects;
import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
@@ -26,8 +26,8 @@ public class NumericFieldCriteria extends FieldCriteria {
}
@Override
- protected Predicate getValuePredicate(Root<Issue> issue, Root<IssueField> field, CriteriaBuilder builder) {
- Path<Integer> attribute = field.get(IssueField.PROP_ORDINAL);
+ protected Predicate getValuePredicate(From<Issue, Issue> issueFrom, From<IssueField, IssueField> fieldFrom, CriteriaBuilder builder) {
+ Path<Integer> attribute = fieldFrom.get(IssueField.PROP_ORDINAL);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
else if (operator == IssueQueryLexer.IsGreaterThan)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java
index 02f904b61d..84b16cfec3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java
@@ -10,8 +10,8 @@ import java.util.Set;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.search.entity.OrEntityCriteria;
@@ -31,8 +31,8 @@ public class OrIssueCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- return new OrEntityCriteria<Issue>(criterias).getPredicate(query, root, builder);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ return new OrEntityCriteria<Issue>(criterias).getPredicate(query, from, builder);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java
index 3147b897b3..5751d404e5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
@@ -22,9 +22,9 @@ public class ProjectCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(
- builder, root.join(Issue.PROP_PROJECT, JoinType.INNER), projectPath);
+ builder, from.join(Issue.PROP_PROJECT, JoinType.INNER), projectPath);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java
index 78c1513973..4ad4f31c4b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java
@@ -4,8 +4,8 @@ import java.util.Objects;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
@@ -28,8 +28,9 @@ public class PullRequestFieldCriteria extends FieldCriteria {
}
@Override
- protected Predicate getValuePredicate(Root<Issue> issue, Root<IssueField> field, CriteriaBuilder builder) {
- return builder.equal(field.get(IssueField.PROP_ORDINAL), request.getId());
+ protected Predicate getValuePredicate(From<Issue, Issue> issueFrom, From<IssueField, IssueField> fieldFrom,
+ CriteriaBuilder builder) {
+ return builder.equal(fieldFrom.get(IssueField.PROP_ORDINAL), request.getId());
}
@Override
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.java
index 5b3e91087d..8debcd0b62 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
@@ -7,9 +7,9 @@ import java.util.Map;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
@@ -27,8 +27,8 @@ public class StateCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- Path<?> attribute = root.get(Issue.PROP_STATE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<?> attribute = from.get(Issue.PROP_STATE);
return builder.equal(attribute, value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
index 06aa35cd7a..c5a5e005ef 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
@@ -1,9 +1,9 @@
package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
@@ -28,8 +28,9 @@ public class StringFieldCriteria extends FieldCriteria {
}
@Override
- protected Predicate getValuePredicate(Root<Issue> issue, Root<IssueField> field, CriteriaBuilder builder) {
- Path<String> attribute = field.get(IssueField.PROP_VALUE);
+ protected Predicate getValuePredicate(From<Issue, Issue> issueFrom, From<IssueField, IssueField> fieldFrom,
+ CriteriaBuilder builder) {
+ Path<String> attribute = fieldFrom.get(IssueField.PROP_VALUE);
if (operator == IssueQueryLexer.Is)
return builder.equal(builder.lower(attribute), value.toLowerCase());
else
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.java
index 3b563caf16..abb7603b88 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
@@ -4,9 +4,9 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.search.entity.EntityQuery;
@@ -28,8 +28,8 @@ public class SubmitDateCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- Path<Date> attribute = root.get(Issue.PROP_SUBMIT_DATE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<Date> attribute = from.get(Issue.PROP_SUBMIT_DATE);
if (operator == IssueQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
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.java
index 48658e659c..2d14c80881 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
@@ -4,9 +4,9 @@ import java.util.Objects;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
@@ -22,8 +22,8 @@ public class SubmittedByCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- Path<User> attribute = root.get(Issue.PROP_SUBMITTER);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<User> attribute = from.get(Issue.PROP_SUBMITTER);
return builder.equal(attribute, user);
}
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.java
index c822685af2..ac6d2b2912 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Issue;
@@ -15,9 +15,9 @@ public class SubmittedByMeCriteria extends IssueCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (User.get() != null) {
- Path<User> attribute = root.get(Issue.PROP_SUBMITTER);
+ Path<User> attribute = from.get(Issue.PROP_SUBMITTER);
return builder.equal(attribute, User.get());
} else {
throw new ExplicitException("Please login to perform this query");
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.java
index 260fd50eb3..99363bfe6a 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
@@ -3,8 +3,8 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.util.match.WildcardUtils;
@@ -20,8 +20,8 @@ public class TitleCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- Expression<String> attribute = root.get(Issue.PROP_TITLE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Expression<String> attribute = from.get(Issue.PROP_TITLE);
return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");
}
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.java
index ee2e087824..1e9e0ec6ad 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
@@ -4,9 +4,9 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.support.LastUpdate;
@@ -36,8 +36,8 @@ public class UpdateDateCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- Path<Date> attribute = IssueQuery.getPath(root, Issue.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<Date> attribute = IssueQuery.getPath(from, Issue.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
if (operator == IssueQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
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.java
index 1f11bf382f..129aa69d68 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
@@ -22,8 +22,8 @@ public class VoteCountCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {
- Path<Integer> attribute = root.get(Issue.PROP_VOTE_COUNT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(Issue.PROP_VOTE_COUNT);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
else if (operator == IssueQueryLexer.IsGreaterThan)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java
index 6d57b70306..14868c6ca4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.project;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
@@ -24,15 +25,15 @@ public class ChildrenOfCriteria extends EntityCriteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Subquery<Project> parentQuery = query.subquery(Project.class);
- Root<Project> parent = parentQuery.from(Project.class);
- parentQuery.select(parent);
+ Root<Project> parentRoot = parentQuery.from(Project.class);
+ parentQuery.select(parentRoot);
ProjectManager manager = OneDev.getInstance(ProjectManager.class);
return builder.exists(parentQuery.where(
- builder.equal(root.get(Project.PROP_PARENT), parent),
- manager.getPathMatchPredicate(builder, parent, parentPath)));
+ builder.equal(from.get(Project.PROP_PARENT), parentRoot),
+ manager.getPathMatchPredicate(builder, parentRoot, parentPath)));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java
index 7dd20e7d11..07b548660d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java
@@ -3,8 +3,8 @@ package io.onedev.server.search.entity.project;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityCriteria;
@@ -22,8 +22,8 @@ public class DescriptionCriteria extends EntityCriteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {
- Expression<String> attribute = root.get(Project.PROP_DESCRIPTION);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ Expression<String> attribute = from.get(Project.PROP_DESCRIPTION);
return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.java
index bca0183bc6..fcd9a7e036 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.project;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityCriteria;
@@ -13,8 +13,8 @@ public class ForkRootsCriteria extends EntityCriteria<Project> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {
- return builder.isNull(root.get(Project.PROP_FORKED_FROM));
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ return builder.isNull(from.get(Project.PROP_FORKED_FROM));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
index ef4b08ce18..79e2f8c0a9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.project;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
@@ -24,15 +25,15 @@ public class ForksOfCriteria extends EntityCriteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Subquery<Project> forkedFromQuery = query.subquery(Project.class);
- Root<Project> forkedFrom = forkedFromQuery.from(Project.class);
- forkedFromQuery.select(forkedFrom);
+ Root<Project> forkedFromRoot = forkedFromQuery.from(Project.class);
+ forkedFromQuery.select(forkedFromRoot);
ProjectManager manager = OneDev.getInstance(ProjectManager.class);
return builder.exists(forkedFromQuery.where(
- builder.equal(root.get(Project.PROP_FORKED_FROM), forkedFrom),
- manager.getPathMatchPredicate(builder, forkedFrom, forkedFromPath)));
+ builder.equal(from.get(Project.PROP_FORKED_FROM), forkedFromRoot),
+ manager.getPathMatchPredicate(builder, forkedFromRoot, forkedFromPath)));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
index 659b47b72d..dc34fe07e8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.project;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityCriteria;
@@ -22,8 +22,8 @@ public class NameCriteria extends EntityCriteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {
- Path<String> attribute = root.get(Project.PROP_NAME);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(Project.PROP_NAME);
return builder.like(builder.lower(attribute), value.replace("*", "%"));
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java
index bf7289dff3..25508a2eea 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java
@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.project;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.GroupAuthorization;
import io.onedev.server.model.Project;
@@ -26,8 +26,8 @@ public class OwnedByCriteria extends EntityCriteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {
- Join<?, ?> userAuthorizationJoin = root.join(Project.PROP_USER_AUTHORIZATIONS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ Join<?, ?> userAuthorizationJoin = from.join(Project.PROP_USER_AUTHORIZATIONS, JoinType.LEFT);
userAuthorizationJoin.on(builder.and(
builder.equal(userAuthorizationJoin.get(UserAuthorization.PROP_ROLE), Role.OWNER_ID),
@@ -36,7 +36,7 @@ public class OwnedByCriteria extends EntityCriteria<Project> {
if (user.getGroups().isEmpty()) {
return userAuthorizationJoin.isNotNull();
} else {
- Join<?, ?> groupAuthorizationJoin = root.join(Project.PROP_GROUP_AUTHORIZATIONS, JoinType.LEFT);
+ Join<?, ?> groupAuthorizationJoin = from.join(Project.PROP_GROUP_AUTHORIZATIONS, JoinType.LEFT);
groupAuthorizationJoin.on(builder.and(
builder.equal(groupAuthorizationJoin.get(GroupAuthorization.PROP_ROLE), Role.OWNER_ID),
groupAuthorizationJoin.get(GroupAuthorization.PROP_GROUP).in(user.getGroups())));
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
index 0081f798c4..afbb357f26 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.project;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Project;
@@ -15,9 +15,9 @@ public class OwnedByMeCriteria extends EntityCriteria<Project> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
if (User.get() != null)
- return new OwnedByCriteria(User.get()).getPredicate(query, root, builder);
+ return new OwnedByCriteria(User.get()).getPredicate(query, from, builder);
else
throw new ExplicitException("Please login to perform this query");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByNoneCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByNoneCriteria.java
index a9e127d85e..c0af0e7e7f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByNoneCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByNoneCriteria.java
@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.project;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.GroupAuthorization;
import io.onedev.server.model.Project;
@@ -18,9 +18,9 @@ public class OwnedByNoneCriteria extends EntityCriteria<Project> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {
- Join<?, ?> userAuthorizationJoin = root.join(Project.PROP_USER_AUTHORIZATIONS, JoinType.LEFT);
- Join<?, ?> groupAuthorizationJoin = root.join(Project.PROP_GROUP_AUTHORIZATIONS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ Join<?, ?> userAuthorizationJoin = from.join(Project.PROP_USER_AUTHORIZATIONS, JoinType.LEFT);
+ Join<?, ?> groupAuthorizationJoin = from.join(Project.PROP_GROUP_AUTHORIZATIONS, JoinType.LEFT);
userAuthorizationJoin.on(builder.equal(
userAuthorizationJoin.get(UserAuthorization.PROP_ROLE), Role.OWNER_ID));
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java
index 058d83f86f..61fec20fe4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.project;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
@@ -23,8 +23,8 @@ public class PathCriteria extends EntityCriteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {
- return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder, root, value);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder, from, value);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.java
index cca44a1c6a..96134c6f70 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.java
@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.project;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityCriteria;
@@ -13,8 +13,8 @@ public class RootsCriteria extends EntityCriteria<Project> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {
- return builder.isNull(root.get(Project.PROP_PARENT));
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ return builder.isNull(from.get(Project.PROP_PARENT));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java
index fc586b5f64..daea3bc046 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java
@@ -4,9 +4,9 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
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.search.entity.EntityCriteria;
@@ -30,8 +30,8 @@ public class UpdateDateCriteria extends EntityCriteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {
- Path<Date> attribute = ProjectQuery.getPath(root, Project.PROP_UPDATE_DATE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ Path<Date> attribute = ProjectQuery.getPath(from, Project.PROP_UPDATE_DATE);
if (operator == ProjectQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
diff --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.java
index 89ac3b3c81..dd2f27fd88 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
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
@@ -26,8 +26,8 @@ public class ApprovedByCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
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.java
index 7a18a656ee..d314c60c18 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
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.PullRequest;
@@ -21,9 +21,9 @@ public class ApprovedByMeCriteria extends EntityCriteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
if (User.get() != null) {
- Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
+ Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java
index bfc2d6ff89..c61572965e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestAssignment;
@@ -25,8 +25,8 @@ public class AssignedToCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(PullRequest.PROP_ASSIGNMENTS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(PullRequest.PROP_ASSIGNMENTS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestAssignment.PROP_USER);
join.on(builder.equal(userPath, user));
return join.isNotNull();
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
index baf333f64f..3d6c877257 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.PullRequest;
@@ -20,9 +20,9 @@ public class AssignedToMeCriteria extends EntityCriteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
if (User.get() != null) {
- Join<?, ?> join = root.join(PullRequest.PROP_ASSIGNMENTS, JoinType.LEFT);
+ Join<?, ?> join = from.join(PullRequest.PROP_ASSIGNMENTS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestAssignment.PROP_USER);
join.on(builder.equal(userPath, User.get()));
return join.isNotNull();
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.java
index 29cad73e7a..45712f0de6 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
@@ -4,9 +4,9 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.CloseInfo;
@@ -30,8 +30,8 @@ public class CloseDateCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Path<Date> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_DATE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Date> attribute = PullRequestQuery.getPath(from, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_DATE);
if (operator == PullRequestQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
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.java
index b74abb3b8a..aee8fea982 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.EntityCriteria;
@@ -23,8 +23,8 @@ public class CommentCountCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Path<Long> attribute = root.get(PullRequest.PROP_COMMENT_COUNT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Long> attribute = from.get(PullRequest.PROP_COMMENT_COUNT);
if (operator == PullRequestQueryLexer.Is)
return builder.equal(attribute, value);
else if (operator == PullRequestQueryLexer.IsGreaterThan)
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.java
index 4a9cde98a9..18830c7743 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
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
@@ -23,8 +23,8 @@ public class CommentCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(PullRequest.PROP_COMMENTS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(PullRequest.PROP_COMMENTS, JoinType.LEFT);
Path<String> attribute = join.get(PullRequestComment.PROP_CONTENT);
join.on(builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%"));
return join.isNotNull();
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.java
index b38ae11405..cc2cc065d7 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
@@ -3,8 +3,8 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.EntityCriteria;
@@ -21,8 +21,8 @@ public class DescriptionCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Expression<String> attribute = root.get(PullRequest.PROP_DESCRIPTION);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Expression<String> attribute = from.get(PullRequest.PROP_DESCRIPTION);
return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");
}
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.java
index 9eb71b91e7..29bccfaf9c 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
@@ -4,9 +4,9 @@ import java.util.Objects;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
@@ -24,8 +24,8 @@ public class DiscardedByCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Path<User> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_USER);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<User> attribute = PullRequestQuery.getPath(from, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_USER);
return builder.equal(attribute, user);
}
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.java
index dd84567361..6123d90639 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.PullRequest;
@@ -17,9 +17,9 @@ public class DiscardedByMeCriteria extends EntityCriteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
if (User.get() != null) {
- Path<User> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_USER);
+ Path<User> attribute = PullRequestQuery.getPath(from, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_USER);
return builder.equal(attribute, User.get());
} else {
throw new ExplicitException("Please login to perform this query");
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.java
index cd4033cb33..94ed8a591a 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
@@ -2,12 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.CloseInfo;
-
import io.onedev.server.search.entity.EntityCriteria;
public class DiscardedCriteria extends EntityCriteria<PullRequest> {
@@ -19,8 +18,8 @@ public class DiscardedCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- return getCriteria().getPredicate(query, root, builder);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ return getCriteria().getPredicate(query, from, builder);
}
@Override
diff --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.java
index 818cfedbb1..80844c035b 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
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.PullRequest;
@@ -18,11 +18,11 @@ public class HasFailedBuildsCriteria extends EntityCriteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(PullRequest.PROP_BUILDS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(PullRequest.PROP_BUILDS, JoinType.LEFT);
Path<?> status = join.get(Build.PROP_STATUS);
- Path<?> mergeCommit = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_MERGED_COMMIT_HASH);
+ Path<?> mergeCommit = PullRequestQuery.getPath(from, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_MERGED_COMMIT_HASH);
Path<?> buildCommit = join.get(Build.PROP_COMMIT);
join.on(builder.and(
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.java
index 55398667cb..772b64e914 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
@@ -2,13 +2,12 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergePreview;
-
import io.onedev.server.search.entity.EntityCriteria;
public class HasMergeConflictsCriteria extends EntityCriteria<PullRequest> {
@@ -16,9 +15,9 @@ public class HasMergeConflictsCriteria extends EntityCriteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Path<?> requestHead = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_HEAD_COMMIT_HASH);
- Path<?> merged = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_MERGED_COMMIT_HASH);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<?> requestHead = PullRequestQuery.getPath(from, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_HEAD_COMMIT_HASH);
+ Path<?> merged = PullRequestQuery.getPath(from, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_MERGED_COMMIT_HASH);
return builder.and(
builder.isNotNull(requestHead),
builder.isNull(merged));
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.java
index b8d20f0cc5..81eaabcfc5 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
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
@@ -19,8 +19,8 @@ public class HasPendingReviewsCriteria extends EntityCriteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.isNull(approvedPath));
return join.isNotNull();
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.java
index eaca297fa0..bed7eb951e 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
@@ -5,8 +5,8 @@ import java.util.Collection;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
@@ -36,12 +36,12 @@ public class IncludesCommitCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Collection<Long> pullRequestIds = getPullRequestIds();
if (!pullRequestIds.isEmpty()) {
return builder.and(
- builder.equal(root.get(PullRequest.PROP_TARGET_PROJECT), project),
- root.get(PullRequest.PROP_ID).in(pullRequestIds));
+ builder.equal(from.get(PullRequest.PROP_TARGET_PROJECT), project),
+ from.get(PullRequest.PROP_ID).in(pullRequestIds));
} else {
return builder.disjunction();
}
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.java
index fc620d3439..e6c09ec570 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
@@ -6,14 +6,14 @@ import java.util.HashSet;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
-import io.onedev.server.infomanager.PullRequestInfoManager;
import io.onedev.server.infomanager.CommitInfoManager;
+import io.onedev.server.infomanager.PullRequestInfoManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -34,12 +34,12 @@ public class IncludesIssueCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Collection<Long> pullRequestIds = getPullRequestIds(issue.getProject());
if (!pullRequestIds.isEmpty()) {
return builder.and(
- builder.equal(root.get(PullRequest.PROP_TARGET_PROJECT), issue.getProject()),
- root.get(PullRequest.PROP_ID).in(pullRequestIds));
+ builder.equal(from.get(PullRequest.PROP_TARGET_PROJECT), issue.getProject()),
+ from.get(PullRequest.PROP_ID).in(pullRequestIds));
} else {
return builder.disjunction();
}
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.java
index 0edde49c2c..67684a83fe 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
@@ -21,8 +21,8 @@ public class MergeStrategyCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Path<?> attribute = root.get(PullRequest.PROP_MERGE_STRATEGY);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<?> attribute = from.get(PullRequest.PROP_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.java
index d67563611c..721ce88621 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
@@ -2,12 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.CloseInfo;
-
import io.onedev.server.search.entity.EntityCriteria;
public class MergedCriteria extends EntityCriteria<PullRequest> {
@@ -19,8 +18,8 @@ public class MergedCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- return getCriteria().getPredicate(query, root, builder);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ return getCriteria().getPredicate(query, from, builder);
}
@Override
diff --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.java
index 27588b44dd..df2e14be33 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
@@ -3,9 +3,9 @@ package io.onedev.server.search.entity.pullrequest;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
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;
@@ -30,8 +30,8 @@ public class NumberCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Path<Long> attribute = root.get(PullRequest.PROP_NUMBER);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Long> attribute = from.get(PullRequest.PROP_NUMBER);
Predicate numberPredicate;
if (operator == PullRequestQueryLexer.Is)
@@ -42,7 +42,7 @@ public class NumberCriteria extends EntityCriteria<PullRequest> {
numberPredicate = builder.lessThan(attribute, number.getNumber());
return builder.and(
- builder.equal(root.get(PullRequest.PROP_TARGET_PROJECT), number.getProject()),
+ builder.equal(from.get(PullRequest.PROP_TARGET_PROJECT), number.getProject()),
numberPredicate);
}
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.java
index b4a7c5fc7c..35d48617c2 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
@@ -2,11 +2,10 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
-
import io.onedev.server.search.entity.EntityCriteria;
public class OpenCriteria extends EntityCriteria<PullRequest> {
@@ -18,8 +17,8 @@ public class OpenCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- return getCriteria().getPredicate(query, root, builder);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ return getCriteria().getPredicate(query, from, builder);
}
@Override
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.java
index 29dc723939..d6e2f4e776 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
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
@@ -26,8 +26,8 @@ public class RequestedForChangesByCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
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.java
index 5531efe278..bd82044fa4 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
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.PullRequest;
@@ -21,9 +21,9 @@ public class RequestedForChangesByMeCriteria extends EntityCriteria<PullRequest>
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
if (User.get() != null) {
- Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
+ Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
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.java
index 57b9b1b364..e810b54f73 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
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
@@ -19,8 +19,8 @@ public class SomeoneRequestedForChangesCriteria extends EntityCriteria<PullReque
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
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.java
index 70af967130..280163d039 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.EntityCriteria;
@@ -21,8 +21,8 @@ public class SourceBranchCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Path<String> attribute = root.get(PullRequest.PROP_SOURCE_BRANCH);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(PullRequest.PROP_SOURCE_BRANCH);
String normalized = branch.toLowerCase().replace("*", "%");
return builder.like(builder.lower(attribute), normalized);
}
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.java
index 7d8b538e3a..ab5aab892d 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
@@ -24,9 +24,9 @@ public class SourceProjectCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder,
- root.join(PullRequest.PROP_SOURCE_PROJECT, JoinType.INNER), projectPath);
+ from.join(PullRequest.PROP_SOURCE_PROJECT, JoinType.INNER), projectPath);
}
@Override
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.java
index 229b224998..5cd709eb4a 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.CloseInfo;
@@ -21,8 +21,8 @@ public class StatusCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Path<?> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_STATUS);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<?> attribute = PullRequestQuery.getPath(from, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_STATUS);
if (value.equalsIgnoreCase(PullRequest.STATE_OPEN))
return builder.isNull(attribute);
else
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.java
index e9a7a0173b..a3f7229efd 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
@@ -4,9 +4,9 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.EntityCriteria;
@@ -29,8 +29,8 @@ public class SubmitDateCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Path<Date> attribute = root.get(PullRequest.PROP_SUBMIT_DATE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Date> attribute = from.get(PullRequest.PROP_SUBMIT_DATE);
if (operator == PullRequestQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
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.java
index ae3e5820c2..d5720ae757 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
@@ -4,9 +4,9 @@ import java.util.Objects;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
@@ -23,8 +23,8 @@ public class SubmittedByCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Path<User> attribute = root.get(PullRequest.PROP_SUBMITTER);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<User> attribute = from.get(PullRequest.PROP_SUBMITTER);
return builder.equal(attribute, user);
}
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.java
index fd498a9d1e..284e197f7c 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.PullRequest;
@@ -16,9 +16,9 @@ public class SubmittedByMeCriteria extends EntityCriteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
if (User.get() != null) {
- Path<?> attribute = root.get(PullRequest.PROP_SUBMITTER);
+ Path<?> attribute = from.get(PullRequest.PROP_SUBMITTER);
return builder.equal(attribute, User.get());
} else {
throw new ExplicitException("Please login to perform this query");
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.java
index f3dd1a03f8..0cf0b2a16f 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
@@ -2,9 +2,9 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.EntityCriteria;
@@ -21,8 +21,8 @@ public class TargetBranchCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Path<String> attribute = root.get(PullRequest.PROP_TARGET_BRANCH);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(PullRequest.PROP_TARGET_BRANCH);
String normalized = branch.toLowerCase().replace("*", "%");
return builder.like(builder.lower(attribute), normalized);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java
index 0528415010..d1dc2dfb1f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java
@@ -2,10 +2,10 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
@@ -25,8 +25,8 @@ public class TargetProjectCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Path<Project> project = root.join(PullRequest.PROP_TARGET_PROJECT, JoinType.INNER);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Project> project = from.join(PullRequest.PROP_TARGET_PROJECT, JoinType.INNER);
return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder, project, projectPath);
}
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.java
index 4b3e144ecc..88b8ffa3ff 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
@@ -3,8 +3,8 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.EntityCriteria;
@@ -21,8 +21,8 @@ public class TitleCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Expression<String> attribute = root.get(PullRequest.PROP_TITLE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Expression<String> attribute = from.get(PullRequest.PROP_TITLE);
return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");
}
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.java
index d804cc8e4c..4629f32121 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
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
@@ -26,8 +26,8 @@ public class ToBeReviewedByCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
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.java
index 01946080ef..ae91e7888c 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
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.PullRequest;
@@ -21,9 +21,9 @@ public class ToBeReviewedByMeCriteria extends EntityCriteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
if (User.get() != null) {
- Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
+ Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
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.java
index 0fcdebcf53..80cc168423 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
@@ -2,11 +2,11 @@ package io.onedev.server.search.entity.pullrequest;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.PullRequest;
@@ -18,11 +18,11 @@ public class ToBeVerifiedByBuildsCriteria extends EntityCriteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Join<?, ?> join = root.join(PullRequest.PROP_BUILDS, JoinType.LEFT);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Join<?, ?> join = from.join(PullRequest.PROP_BUILDS, JoinType.LEFT);
Path<?> status = join.get(Build.PROP_STATUS);
- Path<?> mergeCommit = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_MERGED_COMMIT_HASH);
+ Path<?> mergeCommit = PullRequestQuery.getPath(from, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_MERGED_COMMIT_HASH);
Path<?> buildCommit = join.get(Build.PROP_COMMIT);
join.on(builder.and(
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.java
index e97394460c..4917622276 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
@@ -4,9 +4,9 @@ import java.util.Date;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.LastUpdate;
@@ -30,8 +30,8 @@ public class UpdateDateCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {
- Path<Date> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Date> attribute = PullRequestQuery.getPath(from, PullRequest.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
if (operator == PullRequestQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/FieldNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/FieldNameValidator.java
index 5c51d86873..f9d01908f9 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/FieldNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/FieldNameValidator.java
@@ -3,8 +3,6 @@ package io.onedev.server.util.validation;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.model.Issue;
import io.onedev.server.util.validation.annotation.FieldName;
@@ -29,13 +27,6 @@ public class FieldNameValidator implements ConstraintValidator<FieldName, String
message = "'" + value + "' is reserved";
constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
return false;
- } else if (OneDev.getInstance(LinkSpecManager.class).find(value) != null) {
- constraintContext.disableDefaultConstraintViolation();
- String message = this.message;
- if (message.length() == 0)
- message = "'" + value + "' is used by an issue link";
- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
- return false;
} else {
return true;
}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java
index 4e0b8f17b1..8699816b64 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java
@@ -19,6 +19,8 @@ public class IssueQueryValidator implements ConstraintValidator<IssueQuery, Stri
private boolean withCurrentCommitCriteria;
+ private boolean withCurrentIssueCriteria;
+
@Override
public void initialize(IssueQuery constaintAnnotation) {
message = constaintAnnotation.message();
@@ -26,6 +28,7 @@ public class IssueQueryValidator implements ConstraintValidator<IssueQuery, Stri
withCurrentBuildCriteria = constaintAnnotation.withCurrentBuildCriteria();
withCurrentPullRequestCriteria = constaintAnnotation.withCurrentPullRequestCriteria();
withCurrentCommitCriteria = constaintAnnotation.withCurrentCommitCriteria();
+ withCurrentIssueCriteria = constaintAnnotation.withCurrentIssueCriteria();
}
@Override
@@ -37,7 +40,8 @@ public class IssueQueryValidator implements ConstraintValidator<IssueQuery, Stri
try {
io.onedev.server.search.entity.issue.IssueQuery.parse(project, value,
true, withCurrentUserCriteria, withCurrentBuildCriteria,
- withCurrentPullRequestCriteria, withCurrentCommitCriteria);
+ withCurrentPullRequestCriteria, withCurrentCommitCriteria,
+ withCurrentIssueCriteria);
return true;
} catch (Exception e) {
constraintContext.disableDefaultConstraintViolation();
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/LinkNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/LinkNameValidator.java
deleted file mode 100644
index f84a61479e..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/validation/LinkNameValidator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.onedev.server.util.validation;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Issue;
-import io.onedev.server.util.validation.annotation.LinkName;
-
-public class LinkNameValidator implements ConstraintValidator<LinkName, String> {
-
- private String message;
-
- @Override
- public void initialize(LinkName constaintAnnotation) {
- message = constaintAnnotation.message();
- }
-
- @Override
- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
- if (value == null)
- return true;
-
- if (Issue.ALL_FIELDS.contains(value)) {
- constraintContext.disableDefaultConstraintViolation();
- String message = this.message;
- if (message.length() == 0)
- message = "'" + value + "' is reserved";
- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
- return false;
- } else if (OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(value) != null) {
- constraintContext.disableDefaultConstraintViolation();
- String message = this.message;
- if (message.length() == 0)
- message = "'" + value + "' is used by an issue custom field";
- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
- return false;
- } else {
- return true;
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/LinkName.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/LinkName.java
deleted file mode 100644
index 03a28b15b6..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/LinkName.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.onedev.server.util.validation.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-import io.onedev.server.util.validation.LinkNameValidator;
-
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@Constraint(validatedBy=LinkNameValidator.class)
-public @interface LinkName {
-
- String message() default "";
-
- Class<?>[] groups() default {};
-
- Class<? extends Payload>[] payload() default {};
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/trash.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/trash.svg
index abb45faf6d..1aebe44d50 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/trash.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/trash.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path stroke='currentColor' stroke-width="10" d="M709.47 209.455h221.44a34.91 34.91 0 0 1 0 69.818h-81.455v607.185c0 56.367-44.312 102.633-99.747 102.633H274.292c-55.435 0-99.747-46.266-99.747-102.633V279.273H93.091a34.91 34.91 0 0 1 0-69.818h244.713a186.182 186.182 0 0 1 371.665 0z m-70.052 0a116.364 116.364 0 0 0-231.563 0h231.563z m140.218 69.818H244.364v607.185c0 18.455 13.73 32.815 29.928 32.815h475.416c16.174 0 29.928-14.36 29.928-32.815V279.273z m-418.909 147.2a34.91 34.91 0 0 1 69.818 0V765.37a34.91 34.91 0 0 1-69.818 0V426.473z m232.728 0a34.91 34.91 0 0 1 69.818 0V765.37a34.91 34.91 0 0 1-69.818 0V426.473z" /></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1638319753800" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3000" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M426.666667 42.666667l170.666667 0q52.992 0 90.496 37.504t37.504 90.496l0 42.666667 170.666667 0q17.664 0 30.165333 12.501333t12.501333 30.165333-12.501333 30.165333-30.165333 12.501333l-42.666667 0 0 512q0 52.992-37.504 90.496t-90.496 37.504l-426.666667 0q-52.992 0-90.496-37.504t-37.504-90.496l0-512-42.666667 0q-17.664 0-30.165333-12.501333t-12.501333-30.165333 12.501333-30.165333 30.165333-12.501333l170.666667 0 0-42.666667q0-52.992 37.504-90.496t90.496-37.504zM768 810.666667l0-512-512 0 0 512q0 17.664 12.501333 30.165333t30.165333 12.501333l426.666667 0q17.664 0 30.165333-12.501333t12.501333-30.165333zM597.333333 128l-170.666667 0q-17.664 0-30.165333 12.501333t-12.501333 30.165333l0 42.666667 256 0 0-42.666667q0-17.664-12.501333-30.165333t-30.165333-12.501333z" p-id="3001"></path></svg>
\ No newline at end of file
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.java
index ce4cf17e5a..0f9896df8b 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
@@ -14,11 +14,13 @@ 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.CurrentIssue;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInBuild;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentBuild;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentCommit;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentPullRequest;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInPullRequest;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.HasAny;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.OrderBy;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedBy;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedByMe;
@@ -37,7 +39,6 @@ import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.FenceAware;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
@@ -89,9 +90,12 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
private final boolean withCurrentCommitCriteria;
+ private final boolean withCurrentIssueCriteria;
+
public IssueQueryBehavior(IModel<Project> projectModel, boolean withOrder,
boolean withCurrentUserCriteria, boolean withCurrentBuildCriteria,
- boolean withCurrentPullRequestCriteria, boolean withCurrentCommitCriteria) {
+ boolean withCurrentPullRequestCriteria, boolean withCurrentCommitCriteria,
+ boolean withCurrentIssueCriteria) {
super(IssueQueryParser.class, "query", false);
this.projectModel = projectModel;
this.withOrder = withOrder;
@@ -99,6 +103,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
this.withCurrentBuildCriteria = withCurrentBuildCriteria;
this.withCurrentPullRequestCriteria = withCurrentPullRequestCriteria;
this.withCurrentCommitCriteria = withCurrentCommitCriteria;
+ this.withCurrentIssueCriteria = withCurrentIssueCriteria;
}
@Override
@@ -132,13 +137,6 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
List<String> candidates = new ArrayList<>(Issue.QUERY_FIELDS);
for (FieldSpec field: issueSetting.getFieldSpecs())
candidates.add(field.getName());
- List<LinkSpec> links = new ArrayList<>(getLinkSpecManager().query());
- Collections.sort(links);
- for (LinkSpec link: links) {
- candidates.add(link.getName());
- if (link.getOpposite() != null)
- candidates.add(link.getOpposite().getName());
- }
return SuggestionUtils.suggest(candidates, matchWith);
} else if ("orderField".equals(spec.getLabel())) {
List<String> candidates = new ArrayList<>(Issue.ORDER_FIELDS.keySet());
@@ -175,6 +173,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
else if (operator == FixedInPullRequest)
return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
+ else if (operator == HasAny)
+ return SuggestionUtils.suggestLinkSpecs(matchWith);
else
return SuggestionUtils.suggestCommits(project, matchWith);
} else {
@@ -182,7 +182,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
try {
checkField(fieldName, operator, withCurrentUserCriteria, withCurrentBuildCriteria,
- withCurrentPullRequestCriteria, withCurrentCommitCriteria);
+ withCurrentPullRequestCriteria, withCurrentCommitCriteria, withCurrentIssueCriteria);
LinkSpec linkSpec = getLinkSpecManager().find(fieldName);
if (linkSpec != null) {
return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
@@ -244,6 +244,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
} catch (ExplicitException ex) {
}
}
+ } else if ("linkSpec".equals(spec.getLabel())) {
+ return SuggestionUtils.suggestLinkSpecs(matchWith);
}
return new ArrayList<>();
}
@@ -265,7 +267,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
|| !withCurrentUserCriteria && suggestedLiteral.equals(getRuleName(SubmittedByMe))
|| !withCurrentBuildCriteria && suggestedLiteral.equals(getRuleName(FixedInCurrentBuild))
|| !withCurrentPullRequestCriteria && suggestedLiteral.equals(getRuleName(FixedInCurrentPullRequest))
- || !withCurrentCommitCriteria && suggestedLiteral.equals(getRuleName(FixedInCurrentCommit))) {
+ || !withCurrentCommitCriteria && suggestedLiteral.equals(getRuleName(FixedInCurrentCommit))
+ || !withCurrentIssueCriteria && suggestedLiteral.equals(getRuleName(CurrentIssue))) {
return null;
}
parseExpect = parseExpect.findExpectByLabel("operator");
@@ -276,7 +279,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
try {
checkField(fieldName, getOperator(suggestedLiteral),
withCurrentUserCriteria, withCurrentBuildCriteria,
- withCurrentPullRequestCriteria, withCurrentCommitCriteria);
+ withCurrentPullRequestCriteria, withCurrentCommitCriteria,
+ withCurrentIssueCriteria);
} catch (ExplicitException e) {
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index 2c407fca70..3b8c1f61b7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -216,7 +216,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
private String getDescriptionTemplate(Issue issue) {
for (IssueTemplate template: getIssueSetting().getIssueTemplates()) {
IssueQuery criteria = IssueQuery.parse(getProject(), template.getIssueQuery(),
- true, false, false, false, false);
+ true, false, false, false, false, false);
if (criteria.matches(issue))
return template.getIssueDescription();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index f5a3bc6395..40121d0ebc 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -174,7 +174,7 @@ public abstract class IssueListPanel extends Panel {
@Nullable
private IssueQuery parse(@Nullable String queryString, IssueQuery baseQuery) {
try {
- return IssueQuery.merge(baseQuery, IssueQuery.parse(getProject(), queryString, true, true, false, false, false));
+ return IssueQuery.merge(baseQuery, IssueQuery.parse(getProject(), queryString, true, true, false, false, false, false));
} catch (ExplicitException e) {
error(e.getMessage());
return null;
@@ -373,7 +373,7 @@ public abstract class IssueListPanel extends Panel {
return getProject();
}
- }, true, true, false, false, false) {
+ }, true, true, false, false, false, false) {
@Override
protected void onInput(AjaxRequestTarget target, String inputContent) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html
index fcebbed8bd..08c49eb2c8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html
@@ -16,7 +16,7 @@
<li wicket:id="milestones" class="bg-light rounded p-3">
<div class="d-flex">
<a wicket:id="link" class="mr-2"><span wicket:id="label"></span></a>
- <a wicket:id="delete" class="mr-2 flex-shrink-0" title="Change milestone"><wicket:svg href="trash" class="icon icon-sm"></wicket:svg></a>
+ <a wicket:id="delete" class="mr-2 flex-shrink-0" title="Remove from this milestone"><wicket:svg href="trash" class="icon icon-sm"></wicket:svg></a>
<span wicket:id="status" class="status ml-auto"></span>
</div>
<div wicket:id="progress" class="mt-3"></div>
@@ -69,7 +69,7 @@
<div class="bg-light rounded p-3">
<div class="d-flex align-items-center number-and-state mb-2">
<a wicket:id="number" class="mr-2"><span wicket:id="label"></span></a>
- <a wicket:id="delete" class="mr-2 mb-1"><wicket:svg href="trash" class="icon icon-sm"/></a>
+ <a wicket:id="delete" class="mr-2 mb-1" title="Remove"><wicket:svg href="trash" class="icon icon-sm"/></a>
<span wicket:id="state" class="ml-auto"></span>
</div>
<div class="title d-flex text-nowrap">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 776cfc0f23..a8dabb7db9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -215,22 +215,21 @@ public abstract class IssueSidePanel extends Panel {
@Override
protected List<LinkSide> load() {
List<LinkSide> links = new ArrayList<>();
- List<LinkSpec> specs = new ArrayList<>(OneDev.getInstance(LinkSpecManager.class).query());
- Collections.sort(specs);
+ List<LinkSpec> specs = new ArrayList<>(OneDev.getInstance(LinkSpecManager.class).queryAndSort());
for (LinkSpec spec: specs) {
if (spec.getOpposite() != null) {
IssueQuery query = IssueQuery.parse(getProject(), spec.getOpposite().getIssueQuery(),
- false, false, false, false, false);
+ false, false, false, false, false, false);
if (query.matches(getIssue()))
links.add(new LinkSide(spec, false));
query = IssueQuery.parse(getProject(), spec.getIssueQuery(), false, false, false,
- false, false);
+ false, false, false);
if (query.matches(getIssue()))
links.add(new LinkSide(spec, true));
} else {
IssueQuery query = IssueQuery.parse(getProject(), spec.getIssueQuery(),
- false, false, false, false, false);
+ false, false, false, false, false, false);
if (query.matches(getIssue()))
links.add(new LinkSide(spec, false));
}
@@ -289,10 +288,10 @@ public abstract class IssueSidePanel extends Panel {
LinkSpec spec = model.getObject().spec;
if (opposite) {
return IssueQuery.parse(getProject(), spec.getOpposite().getIssueQuery(),
- false, false, false, false, false);
+ false, false, false, false, false, false);
} else {
return IssueQuery.parse(getProject(), spec.getIssueQuery(),
- false, false, false, false, false);
+ false, false, false, false, false, false);
}
}
@@ -350,10 +349,10 @@ public abstract class IssueSidePanel extends Panel {
LinkSide side = model.getObject();
if (side.opposite) {
return IssueQuery.parse(getProject(), side.spec.getOpposite().getIssueQuery(),
- false, false, false, false, false);
+ false, false, false, false, false, false);
} else {
return IssueQuery.parse(getProject(), side.spec.getIssueQuery(),
- false, false, false, false, false);
+ false, false, false, false, false, false);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.java
index b7902a9a81..b8d1171b0e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.java
@@ -14,13 +14,15 @@ import io.onedev.server.util.validation.IssueQueryValidator;
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy=IssueQueryValidator.class)
public @interface IssueQuery {
- boolean withCurrentUserCriteria();
+ boolean withCurrentUserCriteria() default false;
+
+ boolean withCurrentIssueCriteria() default false;
- boolean withCurrentBuildCriteria();
+ boolean withCurrentBuildCriteria() default false;
- boolean withCurrentPullRequestCriteria();
+ boolean withCurrentPullRequestCriteria() default false;
- boolean withCurrentCommitCriteria();
+ boolean withCurrentCommitCriteria() default false;
boolean withOrder() default true;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java
index 508a776880..74b9f9a000 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java
@@ -66,7 +66,8 @@ public class IssueQueryEditSupport implements EditSupport {
}, issueQuery.withOrder(), issueQuery.withCurrentUserCriteria(),
issueQuery.withCurrentBuildCriteria(),
issueQuery.withCurrentPullRequestCriteria(),
- issueQuery.withCurrentCommitCriteria()));
+ issueQuery.withCurrentCommitCriteria(),
+ issueQuery.withCurrentIssueCriteria()));
};
};
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java
index 1c5dea33fa..44a8c970a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java
@@ -104,10 +104,14 @@ abstract class LinkSpecEditPanel extends GenericPanel<LinkSpec> {
editor.error(new Path(new PathNode.Named("opposite"), new PathNode.Named("name")), errorMessage);
target.add(form);
} else {
+ if (getSpec().isNew())
+ getSpec().setOrder(manager.query().stream().mapToInt(it->it.getOrder()).max().orElse(0)+1);
manager.save(getSpec());
onSave(target);
}
} else {
+ if (getSpec().isNew())
+ getSpec().setOrder(manager.query().stream().mapToInt(it->it.getOrder()).max().orElse(0)+1);
manager.save(getSpec());
onSave(target);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java
index 15223fcf31..17a09ac9c3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.page.admin.issuesetting.linkspec;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.apache.wicket.Component;
@@ -13,6 +14,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
@@ -23,14 +25,16 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.model.LinkSpec;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
@SuppressWarnings("serial")
@@ -70,6 +74,29 @@ public class LinkSpecListPage extends IssueSettingPage {
List<IColumn<LinkSpec, Void>> columns = new ArrayList<>();
+ columns.add(new AbstractColumn<LinkSpec, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<LinkSpec>> cellItem, String componentId, IModel<LinkSpec> rowModel) {
+ cellItem.add(new SpriteImage(componentId, "grip") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("svg");
+ tag.put("class", "icon drag-indicator");
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
columns.add(new AbstractColumn<LinkSpec, Void>(Model.of("Name")) {
@Override
@@ -142,9 +169,7 @@ public class LinkSpecListPage extends IssueSettingPage {
@Override
protected List<LinkSpec> getData() {
- List<LinkSpec> links = getLinkSpecManager().query();
- Collections.sort(links);
- return links;
+ return getLinkSpecManager().queryAndSort();
}
@Override
@@ -167,6 +192,28 @@ public class LinkSpecListPage extends IssueSettingPage {
linksTable.addBottomToolbar(new NoRecordsToolbar(linksTable));
linksTable.add(new NoRecordsBehavior());
linksTable.setOutputMarkupId(true);
+
+ linksTable.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ List<LinkSpec> links = getLinkSpecManager().queryAndSort();
+ int fromIndex = from.getItemIndex();
+ int toIndex = to.getItemIndex();
+ if (fromIndex < toIndex) {
+ for (int i=0; i<toIndex-fromIndex; i++)
+ Collections.swap(links, fromIndex+i, fromIndex+i+1);
+ } else {
+ for (int i=0; i<fromIndex-toIndex; i++)
+ Collections.swap(links, fromIndex-i, fromIndex-i-1);
+ }
+
+ getLinkSpecManager().updateOrders(links);
+
+ target.add(linksTable);
+ }
+
+ }.sortable("tbody"));
}
private LinkSpecManager getLinkSpecManager() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
index cab7d10f47..aa476b2e2c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
@@ -54,6 +54,11 @@ public class StateTransitionListPage extends IssueSettingPage {
add(new ModalLink("addNew") {
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
@Override
protected Component newContent(String id, ModalPanel modal) {
return new TransitionEditPanel(id, -1) {
@@ -147,6 +152,11 @@ public class StateTransitionListPage extends IssueSettingPage {
Fragment fragment = new Fragment(componentId, "actionColumnFrag", StateTransitionListPage.this);
fragment.add(new ModalLink("edit") {
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
@Override
protected Component newContent(String id, ModalPanel modal) {
return new TransitionEditPanel(id, transitionIndex) {
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.java
index d1a12897f0..d62e7d234c 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
@@ -222,7 +222,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
@Override
protected EntityQuery<Issue> parse(String queryString, Project project) {
- return IssueQuery.parse(project, queryString, true, true, false, false, false);
+ return IssueQuery.parse(project, queryString, true, true, false, false, false, false);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
index 0c07d45626..859d906708 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
@@ -141,7 +141,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
IssueQuery query;
try {
- query = IssueQuery.parse(getProject(), queryString, true, true, false, false, false);
+ query = IssueQuery.parse(getProject(), queryString, true, true, false, false, false, false);
} catch (ExplicitException e) {
contentFrag.error(new QueryParseMessage(backlog, "Error parsing %squery: " + e.getMessage()));
return null;
@@ -157,7 +157,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
IssueQuery baseQuery;
try {
- baseQuery = IssueQuery.parse(getProject(), baseQueryString, true, true, false, false, false);
+ baseQuery = IssueQuery.parse(getProject(), baseQueryString, true, true, false, false, false, false);
} catch (ExplicitException e) {
contentFrag.error(new QueryParseMessage(backlog, "Error parsing %sbase query: " + e.getMessage()));
return null;
@@ -646,7 +646,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
});
- queryInput.add(new IssueQueryBehavior(projectModel, true, true, false, false, false));
+ queryInput.add(new IssueQueryBehavior(projectModel, true, true, false, false, false, false));
queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
index 6fa06bed06..1cf81e7315 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
@@ -51,7 +51,7 @@ public class NewIssuePage extends ProjectPage implements InputContext, ScriptIde
@Override
protected IssueCriteria load() {
try {
- return IssueQuery.parse(getProject(), queryString, true, true, false, false, false).getCriteria();
+ return IssueQuery.parse(getProject(), queryString, true, true, false, false, false, false).getCriteria();
} catch (Exception e) {
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index 5254da9ad6..59c169109a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -184,7 +184,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input
@Override
protected EntityQuery<Issue> parse(String queryString, Project project) {
- return IssueQuery.parse(project, queryString, true, true, false, false, false);
+ return IssueQuery.parse(project, queryString, true, true, false, false, false, false);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index b47194918b..795b443f3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,2 +1,3 @@
<wicket:extend>
+ <a wicket:id="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 066be5dd6a..c5689ebd18 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -1,10 +1,14 @@
package io.onedev.server.web.page.test;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.web.page.base.BasePage;
@SuppressWarnings("serial")
@@ -17,6 +21,15 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
+
+ add(new AjaxLink<Void>("test") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ OneDev.getInstance(IssueManager.class).test();
+ }
+
+ });
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/util/IssueAware.java b/server-core/src/main/java/io/onedev/server/web/util/IssueAware.java
new file mode 100644
index 0000000000..72705ba765
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/util/IssueAware.java
@@ -0,0 +1,9 @@
+package io.onedev.server.web.util;
+
+import io.onedev.server.model.Issue;
+
+public interface IssueAware {
+
+ Issue getIssue();
+
+}
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.java
index 4a257f93b5..fc01aba835 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
@@ -35,6 +35,7 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildMetricManager;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -44,6 +45,7 @@ import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
+import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
@@ -242,6 +244,17 @@ public class SuggestionUtils {
return suggestions;
}
+ public static List<InputSuggestion> suggestLinkSpecs(String matchWith) {
+ List<String> linkNames = new ArrayList<>();
+ List<LinkSpec> linkSpecs = OneDev.getInstance(LinkSpecManager.class).queryAndSort();
+ for (LinkSpec link: linkSpecs) {
+ linkNames.add(link.getName());
+ if (link.getOpposite() != null)
+ linkNames.add(link.getOpposite().getName());
+ }
+ return suggest(linkNames, matchWith);
+ }
+
public static List<InputSuggestion> suggestIssues(@Nullable Project project, String matchWith, int count) {
return suggest(project, matchWith, new ProjectScopedSuggester() {