The Unified and Autonomous Development Platform
Fix issue #428 - Associate issue with multiple milestones
Robin Shena310793c94e4
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 1f79e33690..5120188939 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -116,6 +116,7 @@ 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.IssueVoteManager;import io.onedev.server.entitymanager.IssueWatchManager;import io.onedev.server.entitymanager.MembershipManager;@@ -155,6 +156,7 @@ import io.onedev.server.entitymanager.impl.DefaultIssueCommentManager;import io.onedev.server.entitymanager.impl.DefaultIssueFieldManager;import io.onedev.server.entitymanager.impl.DefaultIssueManager;import io.onedev.server.entitymanager.impl.DefaultIssueQueryPersonalizationManager;+import io.onedev.server.entitymanager.impl.DefaultIssueScheduleManager;import io.onedev.server.entitymanager.impl.DefaultIssueVoteManager;import io.onedev.server.entitymanager.impl.DefaultIssueWatchManager;import io.onedev.server.entitymanager.impl.DefaultMembershipManager;@@ -423,6 +425,7 @@ public class CoreModule extends AbstractPluginModule {bind(BuildMetricManager.class).to(DefaultBuildMetricManager.class);bind(EntityReferenceManager.class).to(DefaultEntityReferenceManager.class);bind(GitLfsLockManager.class).to(DefaultGitLfsLockManager.class);+ bind(IssueScheduleManager.class).to(DefaultIssueScheduleManager.class);bind(WebHookManager.class);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.javaindex 21f5089623..f28ea4d51d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java@@ -7,8 +7,6 @@ import java.util.Map;import javax.annotation.Nullable;-import com.google.common.base.Optional;-import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.Milestone;@@ -18,15 +16,19 @@ public interface IssueChangeManager extends EntityManager<IssueChange> {void changeTitle(Issue issue, String title);- void changeMilestone(Issue issue, Milestone milestone);-void changeFields(Issue issue, Map<String, Object> fieldValues);++ void changeMilestones(Issue issue, Collection<Milestone> milestones);++ void addToMilestone(Issue issue, Milestone milestone);++ void removeFromMilestone(Issue issue, Milestone milestone);void changeState(Issue issue, String state, Map<String, Object> fieldValues,Collection<String> removeFields, @Nullable String comment);void batchUpdate(Iterator<? extends Issue> issues, @Nullable String state,- @Nullable Optional<Milestone> milestone, Map<String, Object> fieldValues,+ @Nullable Collection<Milestone> milestone, Map<String, Object> fieldValues,@Nullable String comment);List<IssueChange> queryAfter(Long afterChangeId, int count);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.javaindex b8eb19fd2d..b96f0bfd17 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@@ -78,7 +78,7 @@ public interface IssueManager extends EntityManager<Issue> {Collection<Milestone> queryUsedMilestones(Project project);- void clearMilestones(Project project, Collection<Milestone> milestones);+ void clearSchedules(Project project, Collection<Milestone> milestones);List<Issue> queryAfter(@Nullable Long afterIssueId, int count);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueScheduleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueScheduleManager.javanew file mode 100644index 0000000000..600b1df100--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueScheduleManager.java@@ -0,0 +1,14 @@+package io.onedev.server.entitymanager;++import java.util.Collection;++import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueSchedule;+import io.onedev.server.model.Milestone;+import io.onedev.server.persistence.dao.EntityManager;++public interface IssueScheduleManager extends EntityManager<IssueSchedule> {++ void syncMilestones(Issue issue, Collection<Milestone> milestones);++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.javaindex f9a9cdffea..621139ae42 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java@@ -247,7 +247,7 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Agequery.select(root);if (agentQuery.getCriteria() != null)- query.where(agentQuery.getCriteria().getPredicate(root, builder));+ query.where(agentQuery.getCriteria().getPredicate(query, root, builder));List<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: agentQuery.getSorts()) {@@ -282,7 +282,7 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements AgeRoot<Agent> root = criteriaQuery.from(Agent.class);if (agentCriteria != null)- criteriaQuery.where(agentCriteria.getPredicate(root, builder));+ criteriaQuery.where(agentCriteria.getPredicate(criteriaQuery, root, builder));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 830b42ba4e..9bb08001f3 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@@ -517,10 +517,10 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buiprivate Predicate[] getPredicates(@Nullable Project project,@Nullable io.onedev.server.search.entity.EntityCriteria<Build> criteria,- Root<Build> root, CriteriaBuilder builder) {+ CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Collection<Predicate> predicates = getPredicates(project, root, builder);if (criteria != null)- predicates.add(criteria.getPredicate(root, builder));+ predicates.add(criteria.getPredicate(query, root, builder));return predicates.toArray(new Predicate[0]);}@@ -531,7 +531,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements BuiRoot<Build> root = query.from(Build.class);query.select(root);- query.where(getPredicates(project, buildQuery.getCriteria(), root, builder));+ query.where(getPredicates(project, buildQuery.getCriteria(), query, root, builder));applyOrders(root, query, builder, buildQuery);@@ -573,7 +573,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements BuiRoot<Build> root = criteriaQuery.from(Build.class);criteriaQuery.select(root.get(Build.PROP_ID));- criteriaQuery.where(getPredicates(project, buildQuery.getCriteria(), root, builder));+ criteriaQuery.where(getPredicates(project, buildQuery.getCriteria(), criteriaQuery, root, builder));applyOrders(root, criteriaQuery, builder, buildQuery);@@ -591,7 +591,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements BuiCriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Build> root = criteriaQuery.from(Build.class);- criteriaQuery.where(getPredicates(project, buildCriteria, root, builder));+ criteriaQuery.where(getPredicates(project, buildCriteria, criteriaQuery, root, builder));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex 699dce18a9..6f54041fdb 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@@ -249,14 +249,14 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imprivate Predicate[] getPredicates(Project project,@Nullable io.onedev.server.search.entity.EntityCriteria<CodeComment> criteria,- @Nullable PullRequest request, Root<CodeComment> root, CriteriaBuilder builder) {+ @Nullable PullRequest request, CriteriaQuery<?> query, Root<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));elsepredicates.add(builder.equal(root.get(CodeComment.PROP_PROJECT), project));if (criteria != null)- predicates.add(criteria.getPredicate(root, builder));+ predicates.add(criteria.getPredicate(query, root, builder));return predicates.toArray(new Predicate[0]);}@@ -266,7 +266,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imCriteriaQuery<CodeComment> query = builder.createQuery(CodeComment.class);Root<CodeComment> root = query.from(CodeComment.class);- query.where(getPredicates(project, commentQuery.getCriteria(), request, root, builder));+ query.where(getPredicates(project, commentQuery.getCriteria(), request, query, root, builder));List<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: commentQuery.getSorts()) {@@ -302,7 +302,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imCriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<CodeComment> root = criteriaQuery.from(CodeComment.class);- criteriaQuery.where(getPredicates(project, commentCriteria, request, root, builder));+ criteriaQuery.where(getPredicates(project, commentCriteria, request, criteriaQuery, root, builder));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex af14ea0cc5..ad503591f4 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@@ -16,7 +16,6 @@ import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;-import org.apache.wicket.util.lang.Objects;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Ref;@@ -30,8 +29,6 @@ import org.quartz.ScheduleBuilder;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.google.common.base.Optional;-import io.onedev.commons.loader.Listen;import io.onedev.commons.loader.ListenerRegistry;import io.onedev.commons.utils.LockUtils;@@ -40,6 +37,7 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.IssueScheduleManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.SettingManager;@@ -54,6 +52,7 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;@@ -61,6 +60,8 @@ import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;import io.onedev.server.model.support.issue.changedata.IssueFieldChangeData;import io.onedev.server.model.support.issue.changedata.IssueMilestoneChangeData;+import io.onedev.server.model.support.issue.changedata.IssueMilestoneAddData;+import io.onedev.server.model.support.issue.changedata.IssueMilestoneRemoveData;import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;import io.onedev.server.model.support.issue.changedata.IssueTitleChangeData;import io.onedev.server.model.support.issue.transitiontrigger.BranchUpdateTrigger;@@ -115,6 +116,8 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>private final BuildManager buildManager;+ private final IssueScheduleManager issueScheduleManager;+private final ExecutorService executorService;private final ListenerRegistry listenerRegistry;@@ -128,7 +131,8 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>IssueManager issueManager, IssueFieldManager issueFieldManager,ProjectManager projectManager, BuildManager buildManager,ExecutorService executorService, PullRequestManager pullRequestManager,- ListenerRegistry listenerRegistry, TaskScheduler taskScheduler) {+ ListenerRegistry listenerRegistry, TaskScheduler taskScheduler,+ IssueScheduleManager issueScheduleManager) {super(dao);this.issueManager = issueManager;this.issueFieldManager = issueFieldManager;@@ -139,6 +143,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>this.executorService = executorService;this.listenerRegistry = listenerRegistry;this.taskScheduler = taskScheduler;+ this.issueScheduleManager = issueScheduleManager;}@Transactional@@ -166,16 +171,28 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>@Transactional@Override- public void changeMilestone(Issue issue, @Nullable Milestone milestone) {- Milestone prevMilestone = issue.getMilestone();- if (!Objects.equal(prevMilestone, milestone)) {- issue.setMilestone(milestone);-+ public void addToMilestone(Issue issue, Milestone milestone) {+ issueScheduleManager.save(issue.addToMilestone(milestone));++ IssueChange change = new IssueChange();+ change.setDate(new Date());+ change.setIssue(issue);+ change.setData(new IssueMilestoneAddData(milestone.getName()));+ change.setUser(SecurityUtils.getUser());+ save(change);+ }++ @Transactional+ @Override+ public void removeFromMilestone(Issue issue, Milestone milestone) {+ IssueSchedule schedule = issue.removeFromMilestone(milestone);+ if (schedule != null) {+ issueScheduleManager.delete(schedule);IssueChange change = new IssueChange();- change.setIssue(issue);change.setDate(new Date());+ change.setIssue(issue);+ change.setData(new IssueMilestoneRemoveData(milestone.getName()));change.setUser(SecurityUtils.getUser());- change.setData(new IssueMilestoneChangeData(prevMilestone, milestone));save(change);}}@@ -222,29 +239,38 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>@Transactional@Overridepublic void batchUpdate(Iterator<? extends Issue> issues, @Nullable String state,- @Nullable Optional<Milestone> milestone, Map<String, Object> fieldValues,+ @Nullable Collection<Milestone> milestones, Map<String, Object> fieldValues,@Nullable String comment) {while (issues.hasNext()) {Issue issue = issues.next();String prevState = issue.getState();- Milestone prevMilestone = issue.getMilestone();+ Collection<Milestone> prevMilestones = issue.getMilestones();Map<String, Input> prevFields = issue.getFieldInputs();if (state != null)issue.setState(state);- if (milestone != null)- issue.setMilestone(milestone.orNull());++ if (milestones != null)+ issueScheduleManager.syncMilestones(issue, milestones);issue.setFieldValues(fieldValues);issueFieldManager.saveFields(issue);- IssueChange change = new IssueChange();- change.setIssue(issue);- change.setDate(new Date());- change.setUser(SecurityUtils.getUser());- change.setData(new IssueBatchUpdateData(prevState, issue.getState(), prevMilestone,- issue.getMilestone(), prevFields, issue.getFieldInputs(), comment));-- save(change);+ if (!prevState.equals(issue.getState())+ || !prevFields.equals(issue.getFieldInputs())+ || !new HashSet<>(prevMilestones).equals(new HashSet<>(issue.getMilestones()))) {+ IssueChange change = new IssueChange();+ change.setIssue(issue);+ change.setDate(new Date());+ change.setUser(SecurityUtils.getUser());++ List<Milestone> prevMilestoneList = new ArrayList<>(prevMilestones);+ prevMilestoneList.sort(new Milestone.DatesAndStatusComparator());+ List<Milestone> currentMilestoneList = new ArrayList<>(issue.getMilestones());+ currentMilestoneList.sort(new Milestone.DatesAndStatusComparator());+ change.setData(new IssueBatchUpdateData(prevState, issue.getState(), prevMilestoneList,+ currentMilestoneList, prevFields, issue.getFieldInputs(), comment));+ save(change);+ }}}@@ -581,5 +607,26 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>public void on(SystemStopping event) {taskScheduler.unschedule(taskId);}++ @Transactional+ @Override+ public void changeMilestones(Issue issue, Collection<Milestone> milestones) {+ Collection<Milestone> prevMilestones = new HashSet<>(issue.getMilestones());+ if (!prevMilestones.equals(new HashSet<>(milestones))) {+ issueScheduleManager.syncMilestones(issue, milestones);+ IssueChange change = new IssueChange();+ change.setIssue(issue);+ change.setDate(new Date());+ change.setUser(SecurityUtils.getUser());++ List<Milestone> prevMilestoneList = new ArrayList<>(prevMilestones);+ prevMilestoneList.sort(new Milestone.DatesAndStatusComparator());+ List<Milestone> currentMilestoneList = new ArrayList<>(milestones);+ currentMilestoneList.sort(new Milestone.DatesAndStatusComparator());+ change.setData(new IssueMilestoneChangeData(prevMilestoneList, currentMilestoneList));+ save(change);+ }++ }}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 6557bbe8da..ad54a5cfef 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@@ -40,6 +40,7 @@ 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.ProjectManager;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;@@ -56,6 +57,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;import io.onedev.server.model.IssueField;import io.onedev.server.model.IssueQueryPersonalization;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -125,7 +127,8 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssSettingManager settingManager, ListenerRegistry listenerRegistry,ProjectManager projectManager, UserManager userManager,RoleManager roleManager, AttachmentStorageManager attachmentStorageManager,- IssueCommentManager issueCommentManager, EntityReferenceManager entityReferenceManager) {+ IssueCommentManager issueCommentManager, EntityReferenceManager entityReferenceManager,+ IssueScheduleManager issueScheduleManager) {super(dao);this.issueFieldManager = issueFieldManager;this.issueQueryPersonalizationManager = issueQueryPersonalizationManager;@@ -196,6 +199,8 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isssave(issue);issueFieldManager.saveFields(issue);+ for (IssueSchedule schedule: issue.getSchedules())+ dao.persist(schedule);listenerRegistry.post(event);}@@ -265,7 +270,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssCriteriaQuery<Issue> criteriaQuery = builder.createQuery(Issue.class);Root<Issue> root = criteriaQuery.from(Issue.class);- criteriaQuery.where(getPredicates(issueQuery.getCriteria(), builder, root));+ criteriaQuery.where(getPredicates(issueQuery.getCriteria(), criteriaQuery, builder, root));criteriaQuery.orderBy(getOrders(issueQuery.getSorts(), builder, root));Query<Issue> query = getSession().createQuery(criteriaQuery);@@ -286,7 +291,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssCriteriaQuery<Issue> criteriaQuery = builder.createQuery(Issue.class);Root<Issue> root = criteriaQuery.from(Issue.class);- criteriaQuery.where(getPredicates(project, inTree, issueQuery.getCriteria(), builder, root));+ criteriaQuery.where(getPredicates(project, inTree, issueQuery.getCriteria(), criteriaQuery, builder, root));criteriaQuery.orderBy(getOrders(issueQuery.getSorts(), builder, root));Query<Issue> query = getSession().createQuery(criteriaQuery);@@ -320,7 +325,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssCriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Issue> root = criteriaQuery.from(Issue.class);- criteriaQuery.where(getPredicates(issueCriteria, builder, root));+ criteriaQuery.where(getPredicates(issueCriteria, criteriaQuery, builder, root));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}@@ -332,14 +337,14 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssCriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Issue> root = criteriaQuery.from(Issue.class);- criteriaQuery.where(getPredicates(project, inTree, issueCriteria, builder, root));+ criteriaQuery.where(getPredicates(project, inTree, issueCriteria, criteriaQuery, builder, root));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}private Predicate[] getPredicates(Project project, boolean inTree, @Nullable io.onedev.server.search.entity.EntityCriteria<Issue> issueCriteria,- CriteriaBuilder builder, Root<Issue> root) {+ CriteriaQuery<?> query, CriteriaBuilder builder, Root<Issue> root) {List<Predicate> predicates = new ArrayList<>();Join<Project, Project> join = root.join(Issue.PROP_PROJECT, JoinType.INNER);if (inTree)@@ -347,13 +352,13 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isselsepredicates.add(builder.equal(root.get(Issue.PROP_PROJECT), project));if (issueCriteria != null)- predicates.add(issueCriteria.getPredicate(root, builder));+ predicates.add(issueCriteria.getPredicate(query, root, builder));return predicates.toArray(new Predicate[predicates.size()]);}private Predicate[] getPredicates(@Nullable io.onedev.server.search.entity.EntityCriteria<Issue> issueCriteria,- CriteriaBuilder builder, Root<Issue> root) {+ CriteriaQuery<?> query, CriteriaBuilder builder, Root<Issue> root) {List<Predicate> predicates = new ArrayList<>();if (!SecurityUtils.isAdministrator()) {Collection<Project> projects = projectManager.getPermittedProjects(new AccessProject());@@ -363,7 +368,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isspredicates.add(builder.disjunction());}if (issueCriteria != null)- predicates.add(issueCriteria.getPredicate(root, builder));+ predicates.add(issueCriteria.getPredicate(query, root, builder));return predicates.toArray(new Predicate[predicates.size()]);}@@ -781,18 +786,19 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isspublic Collection<MilestoneAndState> queryMilestoneAndStates(Project project, Collection<Milestone> milestones) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<MilestoneAndState> criteriaQuery = builder.createQuery(MilestoneAndState.class);- Root<Issue> root = criteriaQuery.from(Issue.class);+ Root<IssueSchedule> root = criteriaQuery.from(IssueSchedule.class);+ Join<Issue, Issue> issueJoin = root.join(IssueSchedule.PROP_ISSUE, JoinType.INNER);criteriaQuery.multiselect(- root.get(Issue.PROP_MILESTONE).get(Milestone.PROP_ID),- root.get(Issue.PROP_STATE));+ root.get(IssueSchedule.PROP_MILESTONE).get(Milestone.PROP_ID),+ issueJoin.get(Issue.PROP_STATE));List<Predicate> milestonePredicates = new ArrayList<>();for (Milestone milestone: milestones)- milestonePredicates.add(builder.equal(root.get(Issue.PROP_MILESTONE), milestone));+ milestonePredicates.add(builder.equal(root.get(IssueSchedule.PROP_MILESTONE), milestone));- Join<Project, Project> join = root.join(Issue.PROP_PROJECT, JoinType.INNER);+ Join<Project, Project> projectJoin = issueJoin.join(Issue.PROP_PROJECT, JoinType.INNER);criteriaQuery.where(builder.and(- projectManager.getTreePredicate(builder, join, project),+ projectManager.getTreePredicate(builder, projectJoin, project),builder.or(milestonePredicates.toArray(new Predicate[0]))));return getSession().createQuery(criteriaQuery).getResultList();@@ -803,10 +809,12 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isspublic Collection<Milestone> queryUsedMilestones(Project project) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Milestone> criteriaQuery = builder.createQuery(Milestone.class);- Root<Issue> root = criteriaQuery.from(Issue.class);- criteriaQuery.select(root.get(Issue.PROP_MILESTONE));+ Root<IssueSchedule> root = criteriaQuery.from(IssueSchedule.class);+ criteriaQuery.select(root.get(IssueSchedule.PROP_MILESTONE));- Join<Project, Project> join = root.join(Issue.PROP_PROJECT, JoinType.INNER);+ Join<Project, Project> join = root+ .join(IssueSchedule.PROP_ISSUE, JoinType.INNER)+ .join(Issue.PROP_PROJECT, JoinType.INNER);criteriaQuery.where(projectManager.getTreePredicate(builder, join, project));return getSession().createQuery(criteriaQuery).getResultList();@@ -840,10 +848,13 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Ississue.setNumber(nextNumber);numberMapping.put(oldNumber, nextNumber);- if (issue.getMilestone() != null- && !issue.getMilestone().getProject().isSelfOrAncestorOf(targetProject)) {- issue.setMilestone(null);+ for (IssueSchedule schedule: issue.getSchedules()) {+ if (schedule.getMilestone() != null+ && !schedule.getMilestone().getProject().isSelfOrAncestorOf(targetProject)) {+ dao.remove(schedule);+ }}+}for (Issue issue: issueList) {@@ -891,22 +902,24 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss@Transactional@Override- public void clearMilestones(Project project, Collection<Milestone> milestones) {+ public void clearSchedules(Project project, Collection<Milestone> milestones) {CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<Issue> criteriaQuery = builder.createQuery(Issue.class);- Root<Issue> root = criteriaQuery.from(Issue.class);+ CriteriaQuery<IssueSchedule> criteriaQuery = builder.createQuery(IssueSchedule.class);+ Root<IssueSchedule> root = criteriaQuery.from(IssueSchedule.class);List<Predicate> milestonePredicates = new ArrayList<>();for (Milestone milestone: milestones)- milestonePredicates.add(builder.equal(root.get(Issue.PROP_MILESTONE), milestone));+ milestonePredicates.add(builder.equal(root.get(IssueSchedule.PROP_MILESTONE), milestone));- Join<Project, Project> join = root.join(Issue.PROP_PROJECT, JoinType.INNER);+ Join<Project, Project> join = root+ .join(IssueSchedule.PROP_ISSUE, JoinType.INNER)+ .join(Issue.PROP_PROJECT, JoinType.INNER);criteriaQuery.where(builder.and(projectManager.getTreePredicate(builder, join, project),builder.or(milestonePredicates.toArray(new Predicate[0]))));- for (Issue issue: getSession().createQuery(criteriaQuery).getResultList())- issue.setMilestone(null);+ for (IssueSchedule schedule: getSession().createQuery(criteriaQuery).getResultList())+ dao.remove(schedule);}@Sessionaldiff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueScheduleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueScheduleManager.javanew file mode 100644index 0000000000..843075164a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueScheduleManager.java@@ -0,0 +1,47 @@+package io.onedev.server.entitymanager.impl;++import java.util.Collection;+import java.util.Iterator;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.entitymanager.IssueScheduleManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueSchedule;+import io.onedev.server.model.Milestone;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultIssueScheduleManager extends BaseEntityManager<IssueSchedule>+ implements IssueScheduleManager {++ @Inject+ public DefaultIssueScheduleManager(Dao dao) {+ super(dao);+ }++ @Transactional+ @Override+ public void syncMilestones(Issue issue, Collection<Milestone> milestones) {+ for (Iterator<IssueSchedule> it = issue.getSchedules().iterator(); it.hasNext();) {+ IssueSchedule schedule = it.next();+ if (!milestones.contains(schedule.getMilestone())) {+ dao.remove(schedule);+ it.remove();+ }+ }+ for (Milestone milestone: milestones) {+ if (!issue.getMilestones().contains(milestone)) {+ IssueSchedule schedule = new IssueSchedule();+ schedule.setIssue(issue);+ schedule.setMilestone(milestone);+ issue.getSchedules().add(schedule);+ dao.persist(schedule);+ }+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.javaindex 3253be59a8..4b67b537bf 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java@@ -6,7 +6,6 @@ import javax.inject.Inject;import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import org.hibernate.query.Query;import io.onedev.commons.utils.StringUtils;import io.onedev.server.entitymanager.MilestoneManager;@@ -14,7 +13,6 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;@@ -47,15 +45,6 @@ public class DefaultMilestoneManager extends BaseEntityManager<Milestone> implem}}- @Transactional- @Override- public void delete(Milestone milestone) {- Query<?> query = getSession().createQuery("update Issue set milestone=null where milestone=:milestone");- query.setParameter("milestone", milestone);- query.executeUpdate();- super.delete(milestone);- }-@Sessional@Overridepublic Milestone findInHierarchy(Project project, String name) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 58af46afab..980c53b857 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@@ -213,7 +213,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>milestones.add(milestone);}}- issueManager.clearMilestones(project, milestones);+ issueManager.clearSchedules(project, milestones);settingManager.onRenameProject(oldPath, project.getPath());scheduleTree(project);}@@ -687,7 +687,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>Root<Project> root = query.from(Project.class);query.select(root);- query.where(getPredicates(projectQuery.getCriteria(), root, builder));+ query.where(getPredicates(projectQuery.getCriteria(), query, root, builder));List<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: projectQuery.getSorts()) {@@ -705,7 +705,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>}private Predicate[] getPredicates(@Nullable io.onedev.server.search.entity.EntityCriteria<Project> criteria,- Root<Project> root, CriteriaBuilder builder) {+ CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();if (!SecurityUtils.isAdministrator()) {Collection<Long> projectIds = getPermittedProjects(new AccessProject())@@ -716,7 +716,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>predicates.add(builder.disjunction());}if (criteria != null)- predicates.add(criteria.getPredicate(root, builder));+ predicates.add(criteria.getPredicate(query, root, builder));return predicates.toArray(new Predicate[0]);}@@ -737,7 +737,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Project> root = criteriaQuery.from(Project.class);- criteriaQuery.where(getPredicates(projectCriteria, root, builder));+ criteriaQuery.where(getPredicates(projectCriteria, criteriaQuery, root, builder));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex a407abd823..2b28bd42a8 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@@ -892,7 +892,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imprivate Predicate[] getPredicates(@Nullable Project targetProject,@Nullable io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,- Root<PullRequest> root, CriteriaBuilder builder) {+ CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();if (targetProject != null) {predicates.add(builder.equal(root.get(PullRequest.PROP_TARGET_PROJECT), targetProject));@@ -905,7 +905,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im}if (criteria != null)- predicates.add(criteria.getPredicate(root, builder));+ predicates.add(criteria.getPredicate(query, root, builder));return predicates.toArray(new Predicate[0]);}@@ -916,7 +916,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imquery.distinct(true);Root<PullRequest> root = query.from(PullRequest.class);- query.where(getPredicates(targetProject, requestQuery.getCriteria(), root, builder));+ query.where(getPredicates(targetProject, requestQuery.getCriteria(), query, root, builder));List<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: requestQuery.getSorts()) {@@ -965,7 +965,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imCriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<PullRequest> root = criteriaQuery.from(PullRequest.class);- criteriaQuery.where(getPredicates(targetProject, requestCriteria, root, builder));+ criteriaQuery.where(getPredicates(targetProject, requestCriteria, criteriaQuery, root, builder));criteriaQuery.select(builder.countDistinct(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();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.javaindex c036fb272b..c6ee7dad85 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@@ -3224,5 +3224,54 @@ public class DataMigrator {private void migrate69(File dataDir, Stack<Integer> versions) {}++ // Migrate to 6.0+ private void migrate70(File dataDir, Stack<Integer> versions) {+ Long scheduleId = 1L;+ VersionedXmlDoc issueSchedulesDoc = new VersionedXmlDoc();+ Element listElement = issueSchedulesDoc.addElement("list");+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Issues.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String issueId = element.elementTextTrim("id");+ String issueSubmitDate = element.elementTextTrim("submitDate");+ Element milestoneElement = element.element("milestone");+ if (milestoneElement != null) {+ Element scheduleElement = listElement.addElement("io.onedev.server.model.IssueSchedule");+ scheduleElement.addAttribute("revision", "0.0");+ scheduleElement.addElement("id").setText(String.valueOf(scheduleId++));+ scheduleElement.addElement("issue").setText(issueId);+ scheduleElement.addElement("milestone").setText(milestoneElement.getTextTrim());+ scheduleElement.addElement("date").addAttribute("class", "sql-timestamp").setText(issueSubmitDate);+ milestoneElement.detach();+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("IssueChanges.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element dataElement = element.element("data");+ String dataClass = dataElement.attributeValue("class");+ if (dataClass.contains("IssueMilestoneChangeData") || dataClass.contains("IssueBatchUpdateData")) {+ Element oldMilestonesElement = dataElement.addElement("oldMilestones");+ Element oldMilestoneElement = dataElement.element("oldMilestone");+ if (oldMilestoneElement != null) {+ oldMilestonesElement.addElement("string").setText(oldMilestoneElement.getText());+ oldMilestoneElement.detach();+ }+ Element newMilestonesElement = dataElement.addElement("newMilestones");+ Element newMilestoneElement = dataElement.element("newMilestone");+ if (newMilestoneElement != null) {+ newMilestonesElement.addElement("string").setText(newMilestoneElement.getText());+ newMilestoneElement.detach();+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }+ issueSchedulesDoc.writeToFile(new File(dataDir, "IssueSchedules.xml"), false);+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex c049ee3ea5..76dfaeb720 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@@ -8,6 +8,7 @@ import static io.onedev.server.model.Issue.PROP_SUBMIT_DATE;import static io.onedev.server.model.Issue.PROP_TITLE;import static io.onedev.server.model.Issue.PROP_UUID;import static io.onedev.server.model.Issue.PROP_VOTE_COUNT;+import static io.onedev.server.model.IssueSchedule.NAME_MILESTONE;import java.io.Serializable;import java.util.ArrayList;@@ -80,8 +81,8 @@ import io.onedev.server.web.editable.annotation.Editable;@Index(columnList=PROP_TITLE), @Index(columnList=PROP_NO_SPACE_TITLE),@Index(columnList=PROP_NUMBER), @Index(columnList=PROP_SUBMIT_DATE),@Index(columnList="o_submitter_id"), @Index(columnList=PROP_VOTE_COUNT),- @Index(columnList=PROP_COMMENT_COUNT), @Index(columnList="o_milestone_id"),- @Index(columnList=LastUpdate.COLUMN_DATE), @Index(columnList="o_numberScope_id")},+ @Index(columnList=PROP_COMMENT_COUNT), @Index(columnList=LastUpdate.COLUMN_DATE),+ @Index(columnList="o_numberScope_id")},uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})//use dynamic update in order not to overwrite other edits while background threads change update date@DynamicUpdate@@ -140,12 +141,10 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStpublic static final String PROP_LAST_UPDATE = "lastUpdate";- public static final String NAME_MILESTONE = "Milestone";-- public static final String PROP_MILESTONE = "milestone";-public static final String PROP_FIELDS = "fields";+ public static final String PROP_SCHEDULES = "schedules";+public static final String PROP_UUID = "uuid";public static final String PROP_ID = "id";@@ -187,8 +186,8 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt@JoinColumn(nullable=false)private Project project;- @ManyToOne(fetch=FetchType.LAZY)- private Milestone milestone;+ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)+ private Collection<IssueSchedule> schedules = new ArrayList<>();@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)@@ -343,13 +342,12 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStthis.submitDate = submitDate;}- @Nullable- public Milestone getMilestone() {- return milestone;+ public Collection<IssueSchedule> getSchedules() {+ return schedules;}- public void setMilestone(@Nullable Milestone milestone) {- this.milestone = milestone;+ public void setSchedules(Collection<IssueSchedule> schedules) {+ this.schedules = schedules;}public Collection<IssueComment> getComments() {@@ -493,11 +491,6 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStreturn Issue.class.getName() + ":list:" + projectId;}- @Nullable- public String getMilestoneName() {- return getMilestone()!=null? getMilestone().getName():null;- }-@Nullablepublic Object getFieldValue(String fieldName) {Input input = getFieldInputs().get(fieldName);@@ -714,4 +707,28 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStreturn "#" + getNumber() + " - " + getTitle();}+ public Collection<Milestone> getMilestones() {+ return getSchedules().stream().map(it->it.getMilestone()).collect(Collectors.toList());+ }++ public IssueSchedule addToMilestone(Milestone milestone) {+ IssueSchedule schedule = new IssueSchedule();+ schedule.setIssue(this);+ schedule.setMilestone(milestone);+ getSchedules().add(schedule);+ return schedule;+ }++ @Nullable+ public IssueSchedule removeFromMilestone(Milestone milestone) {+ for (Iterator<IssueSchedule> it = getSchedules().iterator(); it.hasNext();) {+ IssueSchedule schedule = it.next();+ if (schedule.getMilestone().equals(milestone)) {+ it.remove();+ return schedule;+ }+ }+ return null;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/IssueSchedule.java b/server-core/src/main/java/io/onedev/server/model/IssueSchedule.javanew file mode 100644index 0000000000..8726b25023--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/IssueSchedule.java@@ -0,0 +1,68 @@+package io.onedev.server.model;++import java.util.Date;++import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;++@Entity+@Table(+ indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_milestone_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_issue_id", "o_milestone_id"})+})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+public class IssueSchedule extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public static String PROP_ISSUE = "issue";++ public static String NAME_MILESTONE = "Milestone";++ public static String PROP_MILESTONE = "milestone";++ public static String PROP_DATE = "date";++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Issue issue;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Milestone milestone;++ private Date date = new Date();++ public Issue getIssue() {+ return issue;+ }++ public void setIssue(Issue issue) {+ this.issue = issue;+ }++ public Milestone getMilestone() {+ return milestone;+ }++ public void setMilestone(Milestone milestone) {+ this.milestone = milestone;+ }++ public Date getDate() {+ return date;+ }++ public void setDate(Date date) {+ this.date = date;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/Milestone.java b/server-core/src/main/java/io/onedev/server/model/Milestone.javaindex 85ad8e048e..c2fe765e27 100644--- a/server-core/src/main/java/io/onedev/server/model/Milestone.java+++ b/server-core/src/main/java/io/onedev/server/model/Milestone.java@@ -8,6 +8,7 @@ import java.util.HashMap;import java.util.Map;import javax.annotation.Nullable;+import javax.persistence.CascadeType;import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.Index;@@ -66,8 +67,8 @@ public class Milestone extends AbstractEntity {private boolean closed;- @OneToMany(mappedBy="milestone")- private Collection<Issue> issues = new ArrayList<>();+ @OneToMany(mappedBy="milestone", cascade=CascadeType.REMOVE)+ private Collection<IssueSchedule> schedules = new ArrayList<>();public Project getProject() {return project;@@ -129,29 +130,47 @@ public class Milestone extends AbstractEntity {return closed?"Closed":"Open";}- public Collection<Issue> getIssues() {- return issues;+ public Collection<IssueSchedule> getSchedules() {+ return schedules;}- public void setIssues(Collection<Issue> issues) {- this.issues = issues;+ public void setSchedules(Collection<IssueSchedule> schedules) {+ this.schedules = schedules;}-+public Map<String, Integer> getStateStats(Project tree) {Map<String, Integer> stateStats = new HashMap<>();- for (Issue issue: getIssues()) {- if (tree.isSelfOrAncestorOf(issue.getProject())) {- Integer count = stateStats.get(issue.getState());+ for (IssueSchedule schedule: getSchedules()) {+ if (tree.isSelfOrAncestorOf(schedule.getIssue().getProject())) {+ Integer count = stateStats.get(schedule.getIssue().getState());if (count != null)count++;elsecount = 1;- stateStats.put(issue.getState(), count);+ stateStats.put(schedule.getIssue().getState(), count);}}return stateStats;}+ public static class DatesAndStatusComparator extends DatesComparator {++ @Override+ public int compare(Milestone o1, Milestone o2) {+ if (o1.isClosed()) {+ if (o2.isClosed())+ return super.compare(o1, o2) * -1;+ else+ return 1;+ } else if (o2.isClosed()) {+ return -1;+ } else {+ return super.compare(o1, o2);+ }+ }++ }+public static class DatesComparator implements Comparator<Milestone> {@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex eda521b311..c6de5abf1e 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -1360,18 +1360,8 @@ public class Project extends AbstractEntity {public List<Milestone> getSortedHierarchyMilestones() {if (sortedMilestones == null) {- sortedMilestones = new ArrayList<>();- List<Milestone> open = getHierarchyMilestones().stream()- .filter(it->!it.isClosed())- .sorted(new Milestone.DatesComparator())- .collect(Collectors.toList());- sortedMilestones.addAll(open);- List<Milestone> closed = getHierarchyMilestones().stream()- .filter(it->it.isClosed())- .sorted(new Milestone.DatesComparator())- .collect(Collectors.toList());- Collections.reverse(closed);- sortedMilestones.addAll(closed);+ sortedMilestones = new ArrayList<>(getHierarchyMilestones());+ Collections.sort(sortedMilestones, new Milestone.DatesAndStatusComparator());}return sortedMilestones;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.javaindex 0d94d05b2a..7b9509534c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java@@ -1,10 +1,13 @@package io.onedev.server.model.support.issue.changedata;import java.util.LinkedHashMap;+import java.util.List;import java.util.Map;+import java.util.stream.Collectors;import javax.annotation.Nullable;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Milestone;import io.onedev.server.util.CommentAware;import io.onedev.server.util.Input;@@ -17,21 +20,21 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {private final String newState;- private final String oldMilestone;+ private final List<String> oldMilestones;- private final String newMilestone;+ private final List<String> newMilestones;private String comment;public IssueBatchUpdateData(String oldState, String newState,- @Nullable Milestone oldMilestone, @Nullable Milestone newMilestone,+ List<Milestone> oldMilestones, List<Milestone> newMilestones,Map<String, Input> oldFields, Map<String, Input> newFields,@Nullable String comment) {super(oldFields, newFields);this.oldState = oldState;this.newState = newState;- this.oldMilestone = oldMilestone!=null?oldMilestone.getName():null;- this.newMilestone = newMilestone!=null?newMilestone.getName():null;+ this.oldMilestones = oldMilestones.stream().map(it->it.getName()).collect(Collectors.toList());+ this.newMilestones = newMilestones.stream().map(it->it.getName()).collect(Collectors.toList());this.comment = comment;}@@ -39,8 +42,8 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {public Map<String, String> getOldFieldValues() {Map<String, String> oldFieldValues = new LinkedHashMap<>();oldFieldValues.put("State", oldState);- if (oldMilestone != null)- oldFieldValues.put("Milestone", oldMilestone);+ if (!oldMilestones.isEmpty())+ oldFieldValues.put("Milestones", StringUtils.join(oldMilestones));oldFieldValues.putAll(super.getOldFieldValues());return oldFieldValues;}@@ -49,8 +52,8 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {public Map<String, String> getNewFieldValues() {Map<String, String> newFieldValues = new LinkedHashMap<>();newFieldValues.put("State", newState);- if (newMilestone != null)- newFieldValues.put("Milestone", newMilestone);+ if (!newMilestones.isEmpty())+ newFieldValues.put("Milestones", StringUtils.join(newMilestones));newFieldValues.putAll(super.getNewFieldValues());return newFieldValues;}@@ -63,12 +66,12 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {return oldState;}- public String getOldMilestone() {- return oldMilestone;+ public List<String> getOldMilestones() {+ return oldMilestones;}- public String getNewMilestone() {- return newMilestone;+ public List<String> getNewMilestones() {+ return newMilestones;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneAddData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneAddData.javanew file mode 100644index 0000000000..a92d0b0259--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneAddData.java@@ -0,0 +1,46 @@+package io.onedev.server.model.support.issue.changedata;++import java.util.Collection;+import java.util.HashMap;+import java.util.Map;++import io.onedev.server.model.Group;+import io.onedev.server.model.User;+import io.onedev.server.util.CommentAware;++public class IssueMilestoneAddData extends IssueChangeData {++ private static final long serialVersionUID = 1L;++ private final String milestone;++ public IssueMilestoneAddData(String milestone) {+ this.milestone = milestone;+ }++ @Override+ public String getActivity() {+ return "added to milestone \"" + milestone + "\"";+ }++ @Override+ public CommentAware getCommentAware() {+ return null;+ }++ @Override+ public Map<String, Collection<User>> getNewUsers() {+ return new HashMap<>();+ }++ @Override+ public Map<String, Group> getNewGroups() {+ return new HashMap<>();+ }++ @Override+ public boolean affectsListing() {+ return true;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.javaindex 62c1ec6c23..62328e4014 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java@@ -2,10 +2,11 @@ package io.onedev.server.model.support.issue.changedata;import java.util.Collection;import java.util.HashMap;+import java.util.List;import java.util.Map;+import java.util.stream.Collectors;-import javax.annotation.Nullable;-+import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Group;import io.onedev.server.model.Milestone;import io.onedev.server.model.User;@@ -16,26 +17,26 @@ public class IssueMilestoneChangeData extends IssueChangeData {private static final long serialVersionUID = 1L;- private final String oldMilestone;+ private final List<String> oldMilestones;- private final String newMilestone;+ private final List<String> newMilestones;- public IssueMilestoneChangeData(@Nullable Milestone oldMilestone, @Nullable Milestone newMilestone) {- this.oldMilestone = oldMilestone!=null?oldMilestone.getName():null;- this.newMilestone = newMilestone!=null?newMilestone.getName():null;+ public IssueMilestoneChangeData(List<Milestone> oldMilestones, List<Milestone> newMilestones) {+ this.oldMilestones = oldMilestones.stream().map(it->it.getName()).collect(Collectors.toList());+ this.newMilestones = newMilestones.stream().map(it->it.getName()).collect(Collectors.toList());}- public String getOldMilestone() {- return oldMilestone;+ public List<String> getOldMilestones() {+ return oldMilestones;}- public String getNewMilestone() {- return newMilestone;+ public List<String> getNewMilestones() {+ return newMilestones;}@Overridepublic String getActivity() {- return "changed milestone";+ return "changed milestones";}@Override@@ -61,9 +62,9 @@ public class IssueMilestoneChangeData extends IssueChangeData {@Overridepublic ActivityDetail getActivityDetail() {Map<String, String> oldFieldValues = new HashMap<>();- oldFieldValues.put("Milestone", oldMilestone);+ oldFieldValues.put("Milestones", StringUtils.join(oldMilestones));Map<String, String> newFieldValues = new HashMap<>();- oldFieldValues.put("Milestone", newMilestone);+ newFieldValues.put("Milestones", StringUtils.join(newMilestones));return ActivityDetail.compare(oldFieldValues, newFieldValues, true);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneRemoveData.javanew file mode 100644index 0000000000..f6bdc92b08--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneRemoveData.java@@ -0,0 +1,46 @@+package io.onedev.server.model.support.issue.changedata;++import java.util.Collection;+import java.util.HashMap;+import java.util.Map;++import io.onedev.server.model.Group;+import io.onedev.server.model.User;+import io.onedev.server.util.CommentAware;++public class IssueMilestoneRemoveData extends IssueChangeData {++ private static final long serialVersionUID = 1L;++ private final String milestone;++ public IssueMilestoneRemoveData(String milestone) {+ this.milestone = milestone;+ }++ @Override+ public String getActivity() {+ return "removed from milestone \"" + milestone + "\"";+ }++ @Override+ public CommentAware getCommentAware() {+ return null;+ }++ @Override+ public Map<String, Collection<User>> getNewUsers() {+ return new HashMap<>();+ }++ @Override+ public Map<String, Group> getNewGroups() {+ return new HashMap<>();+ }++ @Override+ public boolean affectsListing() {+ return true;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.javaindex ac7f97deda..adc7c57c9d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java@@ -11,14 +11,12 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.Group;import io.onedev.server.model.User;import io.onedev.server.notification.ActivityDetail;-import io.onedev.server.rest.annotation.EntityId;import io.onedev.server.util.CommentAware;public class IssueReferencedFromCodeCommentData extends IssueChangeData implements ReferencedFromAware<CodeComment> {private static final long serialVersionUID = 1L;- @EntityId(CodeComment.class)private final Long commentId;public IssueReferencedFromCodeCommentData(CodeComment comment) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.javaindex 7ea55cd314..2377c1d0c7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java@@ -11,14 +11,12 @@ import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.User;import io.onedev.server.notification.ActivityDetail;-import io.onedev.server.rest.annotation.EntityId;import io.onedev.server.util.CommentAware;public class IssueReferencedFromIssueData extends IssueChangeData implements ReferencedFromAware<Issue> {private static final long serialVersionUID = 1L;- @EntityId(Issue.class)private final Long issueId;public IssueReferencedFromIssueData(Issue issue) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.javaindex 52616712ea..90cdabd6d1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java@@ -11,14 +11,12 @@ import io.onedev.server.model.Group;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.notification.ActivityDetail;-import io.onedev.server.rest.annotation.EntityId;import io.onedev.server.util.CommentAware;public class IssueReferencedFromPullRequestData extends IssueChangeData implements ReferencedFromAware<PullRequest> {private static final long serialVersionUID = 1L;- @EntityId(PullRequest.class)private final Long requestId;public IssueReferencedFromPullRequestData(PullRequest request) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.javaindex d788d5e5be..bfb2882d50 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java@@ -80,8 +80,9 @@ public class FieldUtils {public static Collection<String> getEditablePropertyNames(Project project, Class<?> fieldBeanClass, Collection<String> fieldNames) {BeanDescriptor descriptor = new BeanDescriptor(fieldBeanClass);return fieldNames.stream()+ .filter(it->SecurityUtils.canEditIssueField(project, it)).map(it->getPropertyName(descriptor, it))- .filter(it->it!=null && SecurityUtils.canEditIssueField(project, it))+ .filter(it->it!=null).collect(Collectors.toList());}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.javaindex a80544260d..4b0d05992e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java@@ -5,7 +5,6 @@ import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entityreference.ReferencedFromAware;import io.onedev.server.model.CodeComment;import io.onedev.server.notification.ActivityDetail;-import io.onedev.server.rest.annotation.EntityId;import io.onedev.server.util.CommentAware;public class PullRequestReferencedFromCodeCommentData@@ -13,7 +12,6 @@ public class PullRequestReferencedFromCodeCommentDataprivate static final long serialVersionUID = 1L;- @EntityId(CodeComment.class)private final Long commentId;public PullRequestReferencedFromCodeCommentData(CodeComment comment) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.javaindex c77cab184e..2820a44403 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java@@ -5,7 +5,6 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entityreference.ReferencedFromAware;import io.onedev.server.model.Issue;import io.onedev.server.notification.ActivityDetail;-import io.onedev.server.rest.annotation.EntityId;import io.onedev.server.util.CommentAware;public class PullRequestReferencedFromIssueData@@ -13,7 +12,6 @@ public class PullRequestReferencedFromIssueDataprivate static final long serialVersionUID = 1L;- @EntityId(Issue.class)private final Long issueId;public PullRequestReferencedFromIssueData(Issue issue) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.javaindex e8371d9bb6..d88518e105 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java@@ -5,7 +5,6 @@ import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entityreference.ReferencedFromAware;import io.onedev.server.model.PullRequest;import io.onedev.server.notification.ActivityDetail;-import io.onedev.server.rest.annotation.EntityId;import io.onedev.server.util.CommentAware;public class PullRequestReferencedFromPullRequestData@@ -13,7 +12,6 @@ public class PullRequestReferencedFromPullRequestDataprivate static final long serialVersionUID = 1L;- @EntityId(PullRequest.class)private final Long requestId;public PullRequestReferencedFromPullRequestData(PullRequest request) {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.javaindex 3949b5fbbb..e3b84816cc 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@@ -37,6 +37,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.IssueComment;import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.IssueVote;import io.onedev.server.model.IssueWatch;import io.onedev.server.model.Milestone;@@ -46,7 +47,6 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.rest.annotation.Api;import io.onedev.server.rest.annotation.EntityCreate;-import io.onedev.server.rest.annotation.EntityId;import io.onedev.server.rest.jersey.InvalidParamException;import io.onedev.server.rest.support.RestConstants;import io.onedev.server.search.entity.issue.IssueQuery;@@ -122,6 +122,16 @@ public class IssueResource {return issue.getComments();}+ @Api(order=450)+ @Path("/{issueId}/milestones")+ @GET+ public Collection<Milestone> getMilestones(@PathParam("issueId") Long issueId) {+ Issue issue = issueManager.load(issueId);+ if (!SecurityUtils.canAccess(issue.getProject()))+ throw new UnauthorizedException();+ return issue.getMilestones();+ }+@Api(order=500)@Path("/{issueId}/votes")@GET@@ -191,16 +201,8 @@ public class IssueResource {if (!SecurityUtils.canAccess(project))throw new UnauthorizedException();- Milestone milestone;- if (data.getMilestoneId() != null) {- if (!SecurityUtils.canScheduleIssues(project))- throw new UnauthorizedException();- milestone = milestoneManager.load(data.getMilestoneId());- if (!milestone.getProject().equals(project))- throw new InvalidParamException("Milestone is not defined in current project");- } else {- milestone = null;- }+ if (!data.getMilestoneIds().isEmpty() && !SecurityUtils.canScheduleIssues(project))+ throw new UnauthorizedException();Issue issue = new Issue();issue.setTitle(data.getTitle());@@ -209,7 +211,16 @@ public class IssueResource {issue.setSubmitDate(new Date());issue.setSubmitter(user);issue.setState(settingManager.getIssueSetting().getInitialStateSpec().getName());- issue.setMilestone(milestone);++ for (Long milestoneId: data.getMilestoneIds()) {+ Milestone milestone = milestoneManager.load(milestoneId);+ if (!milestone.getProject().isSelfOrAncestorOf(project))+ throw new InvalidParamException("Milestone is not defined in project hierarchy of the issue");+ IssueSchedule schedule = new IssueSchedule();+ schedule.setIssue(issue);+ schedule.setMilestone(milestone);+ issue.getSchedules().add(schedule);+ }for (Map.Entry<String, String> entry: data.fields.entrySet()) {FieldSpec fieldSpec = settingManager.getIssueSetting().getFieldSpec(entry.getKey());@@ -249,22 +260,23 @@ public class IssueResource {return Response.ok().build();}- @Api(order=1300)- @Path("/{issueId}/milestone")+ @Api(order=1300, description="Schedule issue into specified milestones with list of milestone id")+ @Path("/{issueId}/milestones")@POST- public Response setMilestone(@PathParam("issueId") Long issueId, Long milestoneId) {+ public Response setMilestones(@PathParam("issueId") Long issueId, List<Long> milestoneIds) {Issue issue = issueManager.load(issueId);if (!SecurityUtils.canScheduleIssues(issue.getProject()))throw new UnauthorizedException();- Milestone milestone;- if (milestoneId != null) {- milestone = milestoneManager.load(milestoneId);- if (!milestone.getProject().equals(issue.getProject()))- throw new InvalidParamException("Milestone is not defined in current project");- } else {- milestone = null;+ Collection<Milestone> milestones = new HashSet<>();+ for (Long milestoneId: milestoneIds) {+ Milestone milestone = milestoneManager.load(milestoneId);+ if (!milestone.getProject().isSelfOrAncestorOf(issue.getProject()))+ throw new InvalidParamException("Milestone is not defined in project hierarchy of the issue");+ milestones.add(milestone);}- issueChangeManager.changeMilestone(issue, milestone);++ issueChangeManager.changeMilestones(issue, milestones);+return Response.ok().build();}@@ -347,15 +359,13 @@ public class IssueResource {private static final long serialVersionUID = 1L;- @EntityId(Project.class)private Long projectId;private String title;private String description;- @EntityId(Project.class)- private Long milestoneId;+ private List<Long> milestoneIds = new ArrayList<>();private Map<String, String> fields = new HashMap<>();@@ -385,12 +395,12 @@ public class IssueResource {this.description = description;}- public Long getMilestoneId() {- return milestoneId;+ public List<Long> getMilestoneIds() {+ return milestoneIds;}- public void setMilestoneId(Long milestoneId) {- this.milestoneId = milestoneId;+ public void setMilestoneIds(List<Long> milestoneIds) {+ this.milestoneIds = milestoneIds;}@NotNulldiff --git a/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java b/server-core/src/main/java/io/onedev/server/rest/JobRunResource.javaindex 74126e92ec..4115d67433 100644--- a/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java@@ -36,7 +36,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.rest.annotation.Api;-import io.onedev.server.rest.annotation.EntityId;import io.onedev.server.rest.support.JobRun;import io.onedev.server.rest.support.JobRunOnCommit;import io.onedev.server.rest.support.JobRunOnPullRequest;@@ -175,7 +174,6 @@ public class JobRunResource {private static final long serialVersionUID = 1L;@Api(order=100)- @EntityId(Build.class)private Long buildId;@Api(order=200, description="A map of param name to value list. Normally the value list contains only one "diff --git a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.javaindex c07483e821..3749868900 100644--- a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java@@ -174,7 +174,7 @@ public class ProjectResource {throw new InvalidParamException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);EntityCriteria<Milestone> criteria = EntityCriteria.of(Milestone.class);- criteria.add(Restrictions.eq(Milestone.PROP_PROJECT, project));+ criteria.add(Restrictions.in(Milestone.PROP_PROJECT, project.getSelfAndAncestors()));if (name != null)criteria.add(Restrictions.ilike(Milestone.PROP_NAME, name.replace('%', '*')));if (startBefore != null)diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.javaindex 7a956d6be9..cc8594902e 100644--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java@@ -32,7 +32,6 @@ import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestAssignment;import io.onedev.server.model.PullRequestChange;@@ -45,7 +44,6 @@ import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.rest.annotation.Api;import io.onedev.server.rest.annotation.EntityCreate;-import io.onedev.server.rest.annotation.EntityId;import io.onedev.server.rest.jersey.InvalidParamException;import io.onedev.server.rest.support.RestConstants;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;@@ -402,10 +400,8 @@ public class PullRequestResource {private static final long serialVersionUID = 1L;- @EntityId(Project.class)private Long targetProjectId;- @EntityId(Project.class)private Long sourceProjectId;private String targetBranch;diff --git a/server-core/src/main/java/io/onedev/server/rest/annotation/EntityId.java b/server-core/src/main/java/io/onedev/server/rest/annotation/EntityId.javadeleted file mode 100644index 82c74874c1..0000000000--- a/server-core/src/main/java/io/onedev/server/rest/annotation/EntityId.java+++ /dev/null@@ -1,14 +0,0 @@-package io.onedev.server.rest.annotation;--import java.lang.annotation.ElementType;-import java.lang.annotation.Retention;-import java.lang.annotation.RetentionPolicy;-import java.lang.annotation.Target;--@Retention(RetentionPolicy.RUNTIME)-@Target({ElementType.FIELD})-public @interface EntityId {-- Class<?> value();--}diff --git a/server-core/src/main/java/io/onedev/server/rest/support/JobRunOnCommit.java b/server-core/src/main/java/io/onedev/server/rest/support/JobRunOnCommit.javaindex 027e29e333..2d5df35b81 100644--- a/server-core/src/main/java/io/onedev/server/rest/support/JobRunOnCommit.java+++ b/server-core/src/main/java/io/onedev/server/rest/support/JobRunOnCommit.java@@ -5,10 +5,8 @@ import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.model.Build;-import io.onedev.server.model.Project;import io.onedev.server.rest.annotation.Api;import io.onedev.server.rest.annotation.EntityCreate;-import io.onedev.server.rest.annotation.EntityId;import io.onedev.server.util.validation.annotation.CommitHash;@EntityCreate(Build.class)@@ -17,7 +15,7 @@ public class JobRunOnCommit extends JobRun {private static final long serialVersionUID = 1L;@Api(order=100)- @EntityId(Project.class) Long projectId;+ private Long projectId;@Api(order=200)private String commitHash;diff --git a/server-core/src/main/java/io/onedev/server/rest/support/JobRunOnPullRequest.java b/server-core/src/main/java/io/onedev/server/rest/support/JobRunOnPullRequest.javaindex bb4092ae09..0760a0b9a0 100644--- a/server-core/src/main/java/io/onedev/server/rest/support/JobRunOnPullRequest.java+++ b/server-core/src/main/java/io/onedev/server/rest/support/JobRunOnPullRequest.java@@ -3,10 +3,8 @@ package io.onedev.server.rest.support;import javax.validation.constraints.NotNull;import io.onedev.server.model.Build;-import io.onedev.server.model.PullRequest;import io.onedev.server.rest.annotation.Api;import io.onedev.server.rest.annotation.EntityCreate;-import io.onedev.server.rest.annotation.EntityId;@EntityCreate(Build.class)public class JobRunOnPullRequest extends JobRun {@@ -14,7 +12,6 @@ public class JobRunOnPullRequest extends JobRun {private static final long serialVersionUID = 1L;@Api(order=100, description="OneDev will build against merge preview commit of this pull request")- @EntityId(PullRequest.class)private Long pullRequestId;@NotNulldiff --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.javaindex 5721f2a720..eb3257a765 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@@ -4,6 +4,7 @@ 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;@@ -51,10 +52,10 @@ public class AndEntityCriteria<T extends AbstractEntity> extends EntityCriteria<}@Override- public Predicate getPredicate(Root<T> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<T> root, CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();for (EntityCriteria<T> criteria: criterias)- predicates.add(criteria.getPredicate(root, builder));+ predicates.add(criteria.getPredicate(query, root, builder));return builder.and(predicates.toArray(new Predicate[0]));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.javaindex 4e65f48a0f..9da74db01f 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@@ -6,6 +6,7 @@ import java.util.List;import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -21,7 +22,7 @@ public abstract class EntityCriteria<T extends AbstractEntity> extends Criteria<public static final int IN_CLAUSE_LIMIT = 1000;- public abstract Predicate getPredicate(Root<T> root, CriteriaBuilder builder);+ public abstract Predicate getPredicate(CriteriaQuery<?> query, Root<T> root, CriteriaBuilder builder);public static Predicate inManyValues(CriteriaBuilder builder, Path<Long> attribute, Collection<Long> inValues,Collection<Long> allValues) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/NotEntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/NotEntityCriteria.javaindex 309df58ef4..cd5da60168 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -18,8 +19,8 @@ public class NotEntityCriteria<T extends AbstractEntity> extends EntityCriteria<}@Override- public Predicate getPredicate(Root<T> root, CriteriaBuilder builder) {- return criteria.getPredicate(root, builder).not();+ public Predicate getPredicate(CriteriaQuery<?> query, Root<T> root, CriteriaBuilder builder) {+ return criteria.getPredicate(query, root, builder).not();}@Overridediff --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.javaindex cfeda39400..bda43f57ca 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@@ -4,6 +4,7 @@ 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;@@ -21,10 +22,10 @@ public class OrEntityCriteria<T extends AbstractEntity> extends EntityCriteria<T}@Override- public Predicate getPredicate(Root<T> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<T> root, CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();for (EntityCriteria<T> criteria: criterias)- predicates.add(criteria.getPredicate(root, builder));+ predicates.add(criteria.getPredicate(query, root, builder));return builder.or(predicates.toArray(new Predicate[0]));}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.javaindex 4fb673da9a..08ea760097 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.agent;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;@@ -25,7 +26,7 @@ public class AttributeCriteria extends EntityCriteria<Agent> {}@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(Build.PROP_PARAMS, JoinType.LEFT);join.on(builder.and(builder.equal(join.get(BuildParam.PROP_NAME), name)),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.javaindex 84982fe921..c92af894fb 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.agent;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -23,7 +24,7 @@ public class CpuCriteria extends EntityCriteria<Agent> {}@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {Path<Integer> attribute = root.get(Agent.PROP_CPU);if (operator == AgentQueryLexer.IsGreaterThan)return builder.greaterThan(attribute, value);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.javaindex df197e820f..90625acd77 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.agent;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -24,7 +25,7 @@ public class EverUsedSinceCriteria extends EntityCriteria<Agent> {}@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {return builder.greaterThan(root.get(Agent.PROP_LAST_USED_DATE), date);}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.javaindex 49880291e2..2e9270c7ec 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.agent;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;@@ -21,7 +22,7 @@ public class HasAttributeCriteria extends EntityCriteria<Agent> {}@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(Agent.PROP_ATTRIBUTES, JoinType.LEFT);join.on(builder.equal(join.get(AgentAttribute.PROP_NAME), attributeName));return join.isNotNull();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.javaindex 04a13984a1..c3880dccbc 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.agent;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;@@ -17,7 +18,7 @@ public class HasRunningBuildsCriteria extends EntityCriteria<Agent> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {Join<?, ?> join = root.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.javaindex 159f7cb9c2..4b2b59af26 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.agent;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -20,7 +21,7 @@ public class IpAddressCriteria extends EntityCriteria<Agent> {}@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {Path<String> attribute = root.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.javaindex d653cb8f12..1fd02a3058 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.agent;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -23,7 +24,7 @@ public class MemoryCriteria extends EntityCriteria<Agent> {}@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {Path<Integer> attribute = root.get(Agent.PROP_MEMORY);if (operator == AgentQueryLexer.IsGreaterThan)return builder.greaterThan(attribute, value);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.javaindex da67a40360..9855ecf16d 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.agent;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -20,7 +21,7 @@ public class NameCriteria extends EntityCriteria<Agent> {}@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {Path<String> attribute = root.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.javaindex ab25fc3d5c..1cdf5ba328 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.agent;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -24,7 +25,7 @@ public class NotUsedSinceCriteria extends EntityCriteria<Agent> {}@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {return builder.lessThan(root.get(Agent.PROP_LAST_USED_DATE), date);}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.javaindex cbe85b0996..0be654509f 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.agent;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -12,8 +13,8 @@ public class OfflineCriteria extends EntityCriteria<Agent> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {- return builder.not(new OnlineCriteria().getPredicate(root, builder));+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {+ return builder.not(new OnlineCriteria().getPredicate(query, root, builder));}@Overridediff --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.javaindex ae2194591f..9656c5897d 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.agent;import java.util.Collection;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -18,7 +19,7 @@ public class OnlineCriteria extends EntityCriteria<Agent> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {Path<?> attribute = root.get(Agent.PROP_ID);Collection<Long> agentIds = OneDev.getInstance(AgentManager.class).getOnlineAgentIds();if (!agentIds.isEmpty())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.javaindex 6239ec3a79..544629c8a3 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.agent;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -20,7 +21,7 @@ public class OsArchCriteria extends EntityCriteria<Agent> {}@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {Path<String> attribute = root.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.javaindex 9448af79b0..16c8db3f78 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.agent;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -19,7 +20,7 @@ public class OsCriteria extends EntityCriteria<Agent> {}@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {return builder.equal(root.get(Agent.PROP_OS), value);}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.javaindex 215bdf989d..e0c5ba5aee 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.agent;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -20,7 +21,7 @@ public class OsVersionCriteria extends EntityCriteria<Agent> {}@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {Path<String> attribute = root.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.javaindex 7a65864a58..46c9f2855e 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.agent;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -12,7 +13,7 @@ public class PausedCriteria extends EntityCriteria<Agent> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {return builder.equal(root.get(Agent.PROP_PAUSED), true);}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.javaindex 993a41c600..e771cd13b0 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.agent;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;@@ -25,7 +26,7 @@ public class RanBuildCriteria extends EntityCriteria<Agent> {}@Override- public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Agent> root, CriteriaBuilder builder) {Join<?, ?> join = root.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.javaindex f0492ec62a..9ef4aeb9cf 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -22,7 +23,7 @@ public class BranchCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<String> attribute = root.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.javaindex 3da53723b3..9fb4f31ab2 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -15,7 +16,7 @@ public class BranchIsEmptyCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<String> attribute = root.get(Build.PROP_REF_NAME);return builder.or(builder.isNull(attribute),diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.javaindex 3987dfac1c..e42a49afdd 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.build;import java.util.Objects;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -22,7 +23,7 @@ public class CancelledByCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<User> attribute = root.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.javaindex b9b5217bc0..9a217bc3d0 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -15,7 +16,7 @@ public class CancelledByMeCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {if (User.get() != null) {Path<User> attribute = root.get(Build.PROP_CANCELLER);return builder.equal(attribute, User.get());diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.javaindex 4a08ef7a37..66f91e1727 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -14,7 +15,7 @@ public class CancelledCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.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.javaindex 92a6b576c4..60bdd99273 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -25,7 +26,7 @@ public class CommitCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ 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);return builder.and(diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.javaindex 7e5c75a207..87ba9685e4 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@@ -2,6 +2,7 @@ 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.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;@@ -27,7 +28,7 @@ public class DependenciesOfCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Join<?, ?> join = root.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.javaindex 7d2373d3eb..12efed2152 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@@ -2,6 +2,7 @@ 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.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;@@ -27,7 +28,7 @@ public class DependsOnCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Join<?, ?> join = root.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.javaindex 0f9410c467..f10bafb374 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -14,7 +15,7 @@ public class FailedCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.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.javaindex 1dcb7b04bd..b4e8255af5 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.build;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -29,7 +30,7 @@ public class FinishDateCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(Build.PROP_FINISH_DATE);if (operator == BuildQueryLexer.IsUntil)return builder.lessThan(attribute, date);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.javaindex 2820ee0378..78f642fbe3 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@@ -5,6 +5,7 @@ import java.util.HashSet;import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -44,7 +45,7 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<Long> attribute = root.get(Build.PROP_ID);Project project = issue.getProject();Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(project, issue.getNumber());diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.javaindex b10ac4bc9d..2f53431f4e 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -20,7 +21,7 @@ public class JobCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<String> attribute = root.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.javaindex a11423ddb9..87ef57285c 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@@ -2,6 +2,7 @@ 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.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -29,7 +30,7 @@ public class NumberCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<Long> attribute = root.get(Build.PROP_NUMBER);Predicate numberPredicate;if (operator == BuildQueryLexer.Is)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.javaindex cc27b63664..f0a3d87b16 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.build;import java.util.List;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;@@ -26,7 +27,7 @@ public class ParamCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(Build.PROP_PARAMS, JoinType.LEFT);join.on(builder.and(builder.equal(join.get(BuildParam.PROP_NAME), name)),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.javaindex 5741c9798c..311d9c9f79 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.build;import java.util.List;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;@@ -23,7 +24,7 @@ public class ParamIsEmptyCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Join<?, ?> join1 = root.join(Build.PROP_PARAMS, JoinType.LEFT);join1.on(builder.and(builder.equal(join1.get(BuildParam.PROP_NAME), name)),diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.javaindex 7330adbc5f..5adb9aa33d 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -14,7 +15,7 @@ public class PendingCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.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.javaindex 3cc531ec6d..491fab3287 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.build;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -29,7 +30,7 @@ public class PendingDateCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(Build.PROP_PENDING_DATE);if (operator == BuildQueryLexer.IsUntil)return builder.lessThan(attribute, date);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.javaindex e9344b5f7f..fc84f43c29 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -22,7 +23,7 @@ public class ProjectCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder, root.join(Build.PROP_PROJECT, JoinType.INNER), projectPath);}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.javaindex 2a2184999c..ff796abb85 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@@ -2,6 +2,7 @@ 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.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -26,7 +27,7 @@ public class PullRequestCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<PullRequest> attribute = root.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.javaindex bc7426f0f1..d88f7c0edf 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -12,7 +13,7 @@ public class PullRequestIsEmptyCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {return builder.isNull(root.get(Build.PROP_PULL_REQUEST));}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.javaindex dc3544e493..04cdeb237d 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;@@ -26,7 +27,7 @@ public class RanOnCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Join<?, ?> join = root.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.javaindex d9ed28ad88..1fa87d37d4 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -14,7 +15,7 @@ public class RunningCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.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.javaindex 40195f5bd7..b6e164fb2a 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.build;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -29,7 +30,7 @@ public class RunningDateCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(Build.PROP_RUNNING_DATE);if (operator == BuildQueryLexer.IsUntil)return builder.lessThan(attribute, date);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.javaindex acf5d95132..240e9a446f 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.build;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -28,7 +29,7 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(Build.PROP_SUBMIT_DATE);if (operator == BuildQueryLexer.IsUntil)return builder.lessThan(attribute, date);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.javaindex 6e7e3874e6..28be93c18b 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.build;import java.util.Objects;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -22,7 +23,7 @@ public class SubmittedByCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<User> attribute = root.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.javaindex 90be9f9cdc..65b4a3b9ea 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -15,7 +16,7 @@ public class SubmittedByMeCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {if (User.get() != null) {Path<User> attribute = root.get(Build.PROP_SUBMITTER);return builder.equal(attribute, User.get());diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.javaindex 6255f5c04c..f0cf1dfd62 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -14,7 +15,7 @@ public class SuccessfulCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.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.javaindex 64900182db..5dbc3670b2 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -22,7 +23,7 @@ public class TagCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<String> attribute = root.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.javaindex 52e69b7e08..d83badef11 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -15,7 +16,7 @@ public class TagIsEmptyCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<String> attribute = root.get(Build.PROP_REF_NAME);return builder.or(builder.isNull(attribute),diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.javaindex 5173531f49..89510ded37 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -14,7 +15,7 @@ public class TimedOutCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.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.javaindex f7eac1dd15..7bc0e94b01 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -20,7 +21,7 @@ public class VersionCriteria extends EntityCriteria<Build> {}@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<String> attribute = root.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.javaindex 7ed1300124..ea93363685 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -12,7 +13,7 @@ public class VersionIsEmptyCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {return builder.isNull(root.get(Build.PROP_VERSION));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.javaindex 6837c0c887..4096ca52a1 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -14,7 +15,7 @@ public class WaitingCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Build> root, CriteriaBuilder builder) {Path<?> attribute = root.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.javaindex 874aa9756a..8aa898f806 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@@ -1,6 +1,7 @@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.Predicate;import javax.persistence.criteria.Root;@@ -20,7 +21,7 @@ public class ContentCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {Expression<String> attribute = root.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.javaindex 52b38cf67d..0cc052bad5 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.codecomment;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -27,7 +28,7 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(CodeComment.PROP_CREATE_DATE);if (operator == CodeCommentQueryLexer.IsUntil)return builder.lessThan(attribute, value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.javaindex f49890939f..5c0f32d774 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.codecomment;import java.util.Objects;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -22,7 +23,7 @@ public class CreatedByCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {Path<User> attribute = root.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.javaindex 2764d4f293..eefb555c5b 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.codecomment;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -15,7 +16,7 @@ public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {if (User.get() != null) {Path<?> attribute = root.get(CodeComment.PROP_USER);return builder.equal(attribute, User.get());diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.javaindex a149f7cc5a..2043e5cb29 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.codecomment;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -26,7 +27,7 @@ public class OnCommitCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {+ 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);return builder.and(diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.javaindex a66a2e09c5..81c4b09b06 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.codecomment;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -21,7 +22,7 @@ public class PathCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {Path<String> attribute = CodeCommentQuery.getPath(root, CodeComment.PROP_MARK + "." + Mark.PROP_PATH);String normalized = value.toLowerCase().replace('*', '%');if (normalized.endsWith("/"))diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.javaindex e24b95295f..d875468286 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.codecomment;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -22,7 +23,7 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {Path<Integer> attribute = root.get(CodeComment.PROP_REPLY_COUNT);if (operator == CodeCommentQueryLexer.Is)return builder.equal(attribute, value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.javaindex e4fbabbc4f..622639d997 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.codecomment;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -23,7 +24,7 @@ public class ReplyCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(CodeComment.PROP_REPLIES, JoinType.LEFT);Path<String> attribute = join.get(CodeCommentReply.PROP_CONTENT);join.on(builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%"));diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.javaindex 7d3913ecd8..1fd32c7ee6 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.codecomment;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -28,7 +29,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {}@Override- public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<CodeComment> root, CriteriaBuilder builder) {Path<Date> attribute = CodeCommentQuery.getPath(root, CodeComment.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);if (operator == CodeCommentQueryLexer.IsUntil)return builder.lessThan(attribute, value);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.javaindex cb7f1b4522..efef77deeb 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@@ -9,6 +9,7 @@ import java.util.Map;import java.util.Set;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -30,8 +31,8 @@ public class AndIssueCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {- return new AndEntityCriteria<Issue>(criterias).getPredicate(root, builder);+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {+ return new AndEntityCriteria<Issue>(criterias).getPredicate(query, root, builder);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.javaindex 735c3e0399..8482ec97d9 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.issue;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -21,7 +22,7 @@ public class CommentCountCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Path<Integer> attribute = root.get(Issue.PROP_COMMENT_COUNT);if (operator == IssueQueryLexer.Is)return builder.equal(attribute, value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.javaindex fed4213a71..36f21cedbc 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.issue;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -21,7 +22,7 @@ public class CommentCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(Issue.PROP_COMMENTS, JoinType.LEFT);Path<String> attribute = join.get(IssueComment.PATH_CONTENT);join.on(builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%"));diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.javaindex 8b62f06c6f..a461454c2d 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@@ -1,6 +1,7 @@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.Predicate;import javax.persistence.criteria.Root;@@ -19,7 +20,7 @@ public class DescriptionCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Expression<String> attribute = root.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.javaindex 03cee4657a..ef4449e36b 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@@ -7,6 +7,7 @@ import java.util.Set;import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;@@ -37,7 +38,7 @@ public abstract class FieldCriteria extends IssueCriteria {}@Override- public final Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public final Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(Issue.PROP_FIELDS, JoinType.LEFT);Predicate valuePredicate = getValuePredicate(join, builder);if (valuePredicate != null) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.javaindex e17972a9a9..9f4f134232 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@@ -9,6 +9,7 @@ import java.util.Set;import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -76,7 +77,7 @@ public class FixedBetweenCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Set<Long> fixedIssueNumbers = new HashSet<>();Repository repository = project.getRepository();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.javaindex 9878fa9a49..14ca773e7a 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@@ -4,6 +4,7 @@ import java.util.Collection;import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -32,7 +33,7 @@ public class FixedInBuildCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Collection<Long> fixedIssueNumbers = build.getFixedIssueNumbers();if (!fixedIssueNumbers.isEmpty()) {return builder.and(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.javaindex fc8d867cef..ae71f02687 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@@ -2,6 +2,7 @@ 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.Predicate;import javax.persistence.criteria.Root;@@ -29,7 +30,7 @@ public class FixedInCommitCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {if (!commit.getFixedIssueNumbers().isEmpty()) {return builder.and(builder.equal(root.get(Issue.PROP_PROJECT), commit.getProject()),diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.javaindex a3518e3083..45008b13ae 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.issue;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -13,9 +14,9 @@ public class FixedInCurrentBuildCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {if (Build.get() != null)- return new FixedInBuildCriteria(Build.get()).getPredicate(root, builder);+ return new FixedInBuildCriteria(Build.get()).getPredicate(query, root, builder);elsethrow 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.javaindex 004d07303a..fd0fda0de3 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.issue;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -13,9 +14,9 @@ public class FixedInCurrentCommitCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {if (ProjectScopedCommit.get() != null)- return new FixedInCommitCriteria(ProjectScopedCommit.get()).getPredicate(root, builder);+ return new FixedInCommitCriteria(ProjectScopedCommit.get()).getPredicate(query, root, builder);elsethrow 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.javaindex 38ba5d51ab..f50d5db194 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.issue;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -13,9 +14,9 @@ public class FixedInCurrentPullRequestCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {if (PullRequest.get() != null)- return new FixedInPullRequestCriteria(PullRequest.get()).getPredicate(root, builder);+ return new FixedInPullRequestCriteria(PullRequest.get()).getPredicate(query, root, builder);elsethrow 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.javaindex e25d58505a..33300be925 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@@ -4,6 +4,7 @@ import java.util.Collection;import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -31,7 +32,7 @@ public class FixedInPullRequestCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Collection<Long> fixedIssueNumbers = request.getFixedIssueNumbers();if (!fixedIssueNumbers.isEmpty()) {return builder.and(diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex e733b96dd4..56276c9ca4 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@@ -22,6 +22,7 @@ import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.field.spec.BooleanField;@@ -153,7 +154,7 @@ public class IssueQuery extends EntityQuery<Issue> {checkField(fieldName, operator, withCurrentUserCriteria, withCurrentBuildCriteria,withCurrentPullRequestCriteria, withCurrentCommitCriteria);}- if (fieldName.equals(Issue.NAME_MILESTONE)) {+ if (fieldName.equals(IssueSchedule.NAME_MILESTONE)) {return new MilestoneIsEmptyCriteria();} else {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);@@ -226,7 +227,7 @@ public class IssueQuery extends EntityQuery<Issue> {case IssueQueryLexer.Is:if (fieldName.equals(Issue.NAME_PROJECT)) {return new ProjectCriteria(value);- } else if (fieldName.equals(Issue.NAME_MILESTONE)) {+ } else if (fieldName.equals(IssueSchedule.NAME_MILESTONE)) {return new MilestoneCriteria(value);} else if (fieldName.equals(Issue.NAME_STATE)) {return new StateCriteria(value);@@ -358,7 +359,7 @@ public class IssueQuery extends EntityQuery<Issue> {switch (operator) {case IssueQueryLexer.IsEmpty:if (Issue.QUERY_FIELDS.contains(fieldName)- && !fieldName.equals(Issue.NAME_MILESTONE)) {+ && !fieldName.equals(IssueSchedule.NAME_MILESTONE)) {throw newOperatorException(fieldName, operator);}break;@@ -398,7 +399,7 @@ public class IssueQuery extends EntityQuery<Issue> {&& !fieldName.equals(Issue.NAME_VOTE_COUNT)&& !fieldName.equals(Issue.NAME_COMMENT_COUNT)&& !fieldName.equals(Issue.NAME_NUMBER)- && !fieldName.equals(Issue.NAME_MILESTONE)+ && !fieldName.equals(IssueSchedule.NAME_MILESTONE)&& !(fieldSpec instanceof IssueChoiceField)&& !(fieldSpec instanceof PullRequestChoiceField)&& !(fieldSpec instanceof BuildChoiceField)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.javaindex 080af7fe54..b5f6836a70 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@@ -1,12 +1,15 @@package io.onedev.server.search.entity.issue;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+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 javax.persistence.criteria.Subquery;import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Milestone;import io.onedev.server.util.match.WildcardUtils;@@ -21,30 +24,39 @@ public class MilestoneCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {- Path<String> attribute = root.join(Issue.PROP_MILESTONE, JoinType.LEFT).get(Milestone.PROP_NAME);- String normalized = milestoneName.replace("*", "%");- return builder.like(attribute, normalized);+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {+ Subquery<IssueSchedule> subQuery = query.subquery(IssueSchedule.class);+ Root<IssueSchedule> scheduleRoot = subQuery.from(IssueSchedule.class);+ subQuery.select(scheduleRoot);+ Join<?, ?> milestoneJoin = scheduleRoot.join(IssueSchedule.PROP_MILESTONE, JoinType.INNER);+ subQuery.where(builder.and(+ builder.equal(scheduleRoot.get(IssueSchedule.PROP_ISSUE), root),+ builder.like(milestoneJoin.get(Milestone.PROP_NAME), milestoneName.replace("*", "%"))));+ return builder.exists(subQuery);}@Overridepublic boolean matches(Issue issue) {- if (issue.getMilestone() != null)- return WildcardUtils.matchString(milestoneName, issue.getMilestone().getName());- else- return false;+ return issue.getSchedules().stream()+ .anyMatch(it->WildcardUtils.matchString(milestoneName, it.getMilestone().getName()));}@Overridepublic String toStringWithoutParens() {- return quote(Issue.NAME_MILESTONE) + " "+ return quote(IssueSchedule.NAME_MILESTONE) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ quote(milestoneName);}@Overridepublic void fill(Issue issue) {- issue.setMilestone(issue.getProject().getHierarchyMilestone(milestoneName));+ Milestone milestone = issue.getProject().getHierarchyMilestone(milestoneName);+ if (milestone != null) {+ IssueSchedule schedule = new IssueSchedule();+ schedule.setIssue(issue);+ schedule.setMilestone(milestone);+ issue.getSchedules().add(schedule);+ }}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.javaindex 6513674fcd..4b14d34bf3 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@@ -1,29 +1,30 @@package io.onedev.server.search.entity.issue;import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueSchedule;public class MilestoneIsEmptyCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {- return builder.isNull(root.join(Issue.PROP_MILESTONE, JoinType.LEFT));+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {+ return builder.isEmpty(root.get(Issue.PROP_SCHEDULES));}@Overridepublic boolean matches(Issue issue) {- return issue.getMilestone() == null;+ return issue.getSchedules().isEmpty();}@Overridepublic String toStringWithoutParens() {- return quote(Issue.NAME_MILESTONE) + " "+ return quote(IssueSchedule.NAME_MILESTONE) + " "+ IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);}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.javaindex 9f6681f1b7..b731863bf5 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@@ -4,6 +4,7 @@ import java.util.Collection;import java.util.Map;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -25,8 +26,8 @@ public class NotIssueCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {- return new NotEntityCriteria<Issue>(criteria).getPredicate(root, builder);+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {+ return new NotEntityCriteria<Issue>(criteria).getPredicate(query, root, builder);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.javaindex 2815946f36..9772e6ad85 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@@ -2,6 +2,7 @@ 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.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -29,7 +30,7 @@ public class NumberCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Path<Long> attribute = root.get(Issue.PROP_NUMBER);Predicate numberPredicate;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.javaindex 994581dcae..02f904b61d 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@@ -9,6 +9,7 @@ import java.util.Map;import java.util.Set;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -30,8 +31,8 @@ public class OrIssueCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {- return new OrEntityCriteria<Issue>(criterias).getPredicate(root, builder);+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {+ return new OrEntityCriteria<Issue>(criterias).getPredicate(query, root, builder);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.javaindex 7d66fc9272..3147b897b3 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.issue;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -21,7 +22,7 @@ public class ProjectCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder, root.join(Issue.PROP_PROJECT, JoinType.INNER), projectPath);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.javaindex 03d71ae57e..5b3e91087d 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@@ -6,6 +6,7 @@ import java.util.List;import java.util.Map;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -26,7 +27,7 @@ public class StateCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Path<?> attribute = root.get(Issue.PROP_STATE);return builder.equal(attribute, value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.javaindex 5d0499410b..3b563caf16 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.issue;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -27,7 +28,7 @@ public class SubmitDateCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(Issue.PROP_SUBMIT_DATE);if (operator == IssueQueryLexer.IsUntil)return builder.lessThan(attribute, date);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.javaindex d6ce86a08c..48658e659c 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.issue;import java.util.Objects;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -21,7 +22,7 @@ public class SubmittedByCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Path<User> attribute = root.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.javaindex 0cec33cba1..c822685af2 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.issue;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -14,7 +15,7 @@ public class SubmittedByMeCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {if (User.get() != null) {Path<User> attribute = root.get(Issue.PROP_SUBMITTER);return builder.equal(attribute, User.get());diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.javaindex 39ba97a93f..260fd50eb3 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@@ -1,6 +1,7 @@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.Predicate;import javax.persistence.criteria.Root;@@ -19,7 +20,7 @@ public class TitleCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Expression<String> attribute = root.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.javaindex d9868adf10..ee2e087824 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.issue;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -35,7 +36,7 @@ public class UpdateDateCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Path<Date> attribute = IssueQuery.getPath(root, Issue.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);if (operator == IssueQueryLexer.IsUntil)return builder.lessThan(attribute, date);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.javaindex 1961783293..1f11bf382f 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.issue;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -21,7 +22,7 @@ public class VoteCountCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Issue> root, CriteriaBuilder builder) {Path<Integer> attribute = root.get(Issue.PROP_VOTE_COUNT);if (operator == IssueQueryLexer.Is)return builder.equal(attribute, value);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.javaindex 93dd7f4c79..739f80247c 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.project;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -22,7 +23,7 @@ public class ChildrenOfCriteria extends EntityCriteria<Project> {}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder, root.join(Project.PROP_PARENT), parentPath);}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.javaindex 4a938168bb..7dd20e7d11 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@@ -1,6 +1,7 @@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.Predicate;import javax.persistence.criteria.Root;@@ -21,7 +22,7 @@ public class DescriptionCriteria extends EntityCriteria<Project> {}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {Expression<String> attribute = root.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.javaindex 7fff128d82..bca0183bc6 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.project;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -12,7 +13,7 @@ public class ForkRootsCriteria extends EntityCriteria<Project> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {return builder.isNull(root.get(Project.PROP_FORKED_FROM));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.javaindex 2761086701..851a1fbb1c 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.project;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -22,7 +23,7 @@ public class ForksOfCriteria extends EntityCriteria<Project> {}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder, root.join(Project.PROP_FORKED_FROM), forkedFromPath);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.javaindex 8145088f3a..659b47b72d 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.project;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -21,7 +22,7 @@ public class NameCriteria extends EntityCriteria<Project> {}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {Path<String> attribute = root.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.javaindex 8829018f07..bf7289dff3 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.project;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;@@ -25,7 +26,7 @@ public class OwnedByCriteria extends EntityCriteria<Project> {}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {Join<?, ?> userAuthorizationJoin = root.join(Project.PROP_USER_AUTHORIZATIONS, JoinType.LEFT);userAuthorizationJoin.on(builder.and(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.javaindex 15fa6f0820..0081f798c4 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.project;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -14,9 +15,9 @@ public class OwnedByMeCriteria extends EntityCriteria<Project> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {if (User.get() != null)- return new OwnedByCriteria(User.get()).getPredicate(root, builder);+ return new OwnedByCriteria(User.get()).getPredicate(query, root, builder);elsethrow 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.javaindex cfcdce0adc..a9e127d85e 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.project;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;@@ -17,7 +18,7 @@ public class OwnedByNoneCriteria extends EntityCriteria<Project> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ 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);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.javaindex a699d45ac9..058d83f86f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java@@ -1,6 +1,7 @@package io.onedev.server.search.entity.project;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -22,7 +23,7 @@ public class PathCriteria extends EntityCriteria<Project> {}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder, root, value);}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.javaindex 74f1ddbb58..cca44a1c6a 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.project;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -12,7 +13,7 @@ public class RootsCriteria extends EntityCriteria<Project> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {return builder.isNull(root.get(Project.PROP_PARENT));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.javaindex 9c1124e8e2..fc586b5f64 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.project;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -29,7 +30,7 @@ public class UpdateDateCriteria extends EntityCriteria<Project> {}@Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<Project> root, CriteriaBuilder builder) {Path<Date> attribute = ProjectQuery.getPath(root, Project.PROP_UPDATE_DATE);if (operator == ProjectQueryLexer.IsUntil)return builder.lessThan(attribute, date);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.javaindex 9c1d80a30b..89ac3b3c81 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -25,7 +26,7 @@ public class ApprovedByCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Join<?, ?> join = root.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);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.javaindex 0c2d1ed7f4..7a18a656ee 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -20,7 +21,7 @@ public class ApprovedByMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {if (User.get() != null) {Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);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.javaindex e4b4bffa54..bfc2d6ff89 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -24,7 +25,7 @@ public class AssignedToCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(PullRequest.PROP_ASSIGNMENTS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestAssignment.PROP_USER);join.on(builder.equal(userPath, user));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.javaindex e4a4623ef2..baf333f64f 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -19,7 +20,7 @@ public class AssignedToMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {if (User.get() != null) {Join<?, ?> join = root.join(PullRequest.PROP_ASSIGNMENTS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestAssignment.PROP_USER);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.javaindex eb26221f2c..29cad73e7a 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.pullrequest;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -29,7 +30,7 @@ public class CloseDateCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Path<Date> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_DATE);if (operator == PullRequestQueryLexer.IsUntil)return builder.lessThan(attribute, date);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.javaindex 720d4c7705..b74abb3b8a 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -22,7 +23,7 @@ public class CommentCountCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Path<Long> attribute = root.get(PullRequest.PROP_COMMENT_COUNT);if (operator == PullRequestQueryLexer.Is)return builder.equal(attribute, value);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.javaindex d17f24dacd..4a9cde98a9 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -22,7 +23,7 @@ public class CommentCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(PullRequest.PROP_COMMENTS, JoinType.LEFT);Path<String> attribute = join.get(PullRequestComment.PROP_CONTENT);join.on(builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%"));diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.javaindex 4cb6e79b8f..b38ae11405 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@@ -1,6 +1,7 @@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.Predicate;import javax.persistence.criteria.Root;@@ -20,7 +21,7 @@ public class DescriptionCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Expression<String> attribute = root.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.javaindex a72d6b9cf2..9eb71b91e7 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.pullrequest;import java.util.Objects;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -23,7 +24,7 @@ public class DiscardedByCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Path<User> attribute = PullRequestQuery.getPath(root, 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.javaindex 92591bc4fe..dd84567361 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -16,7 +17,7 @@ public class DiscardedByMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {if (User.get() != null) {Path<User> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_USER);return builder.equal(attribute, User.get());diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.javaindex 7332ef748a..cd4033cb33 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -18,8 +19,8 @@ public class DiscardedCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {- return getCriteria().getPredicate(root, builder);+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {+ return getCriteria().getPredicate(query, root, builder);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.javaindex 81737a019a..818cfedbb1 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -17,7 +18,7 @@ public class HasFailedBuildsCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(PullRequest.PROP_BUILDS, JoinType.LEFT);Path<?> status = join.get(Build.PROP_STATUS);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.javaindex c778874df3..55398667cb 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -15,7 +16,7 @@ public class HasMergeConflictsCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ 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);return builder.and(diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.javaindex d748baad3d..b8d20f0cc5 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -18,7 +19,7 @@ public class HasPendingReviewsCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);join.on(builder.isNull(approvedPath));diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.javaindex b88d00fe57..eaca297fa0 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@@ -4,6 +4,7 @@ import java.util.Collection;import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -35,7 +36,7 @@ public class IncludesCommitCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Collection<Long> pullRequestIds = getPullRequestIds();if (!pullRequestIds.isEmpty()) {return builder.and(diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.javaindex 3bfe9921bb..fc620d3439 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@@ -5,6 +5,7 @@ import java.util.HashSet;import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -33,7 +34,7 @@ public class IncludesIssueCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Collection<Long> pullRequestIds = getPullRequestIds(issue.getProject());if (!pullRequestIds.isEmpty()) {return builder.and(diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.javaindex 082eb6152a..0edde49c2c 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -20,7 +21,7 @@ public class MergeStrategyCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Path<?> attribute = root.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.javaindex cf39c06647..d67563611c 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -18,8 +19,8 @@ public class MergedCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {- return getCriteria().getPredicate(root, builder);+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {+ return getCriteria().getPredicate(query, root, builder);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.javaindex 70480336c1..27588b44dd 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@@ -2,6 +2,7 @@ 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.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -29,7 +30,7 @@ public class NumberCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Path<Long> attribute = root.get(PullRequest.PROP_NUMBER);Predicate 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.javaindex 4b1b0e0424..b4a7c5fc7c 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -17,8 +18,8 @@ public class OpenCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {- return getCriteria().getPredicate(root, builder);+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {+ return getCriteria().getPredicate(query, root, builder);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.javaindex 9e5784bfe1..29dc723939 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -25,7 +26,7 @@ public class RequestedForChangesByCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Join<?, ?> join = root.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);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.javaindex 57dfdf2ecb..5531efe278 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -20,7 +21,7 @@ public class RequestedForChangesByMeCriteria extends EntityCriteria<PullRequest>private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {if (User.get() != null) {Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.javaindex bdd35dcbd6..57b9b1b364 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -18,7 +19,7 @@ public class SomeoneRequestedForChangesCriteria extends EntityCriteria<PullRequeprivate static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Join<?, ?> join = root.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);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.javaindex 8b1ce91020..70af967130 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -20,7 +21,7 @@ public class SourceBranchCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Path<String> attribute = root.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.javaindex bb878704d9..7d8b538e3a 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -23,7 +24,7 @@ public class SourceProjectCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder,root.join(PullRequest.PROP_SOURCE_PROJECT, JoinType.INNER), projectPath);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.javaindex a90b3a7b5f..229b224998 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -20,7 +21,7 @@ public class StatusCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Path<?> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_STATUS);if (value.equalsIgnoreCase(PullRequest.STATE_OPEN))return builder.isNull(attribute);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.javaindex 86f0cb45eb..e9a7a0173b 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.pullrequest;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -28,7 +29,7 @@ public class SubmitDateCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Path<Date> attribute = root.get(PullRequest.PROP_SUBMIT_DATE);if (operator == PullRequestQueryLexer.IsUntil)return builder.lessThan(attribute, date);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.javaindex 41b8beb3fb..ae3e5820c2 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.pullrequest;import java.util.Objects;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -22,7 +23,7 @@ public class SubmittedByCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Path<User> attribute = root.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.javaindex a373d557a9..fd498a9d1e 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -15,7 +16,7 @@ public class SubmittedByMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {if (User.get() != null) {Path<?> attribute = root.get(PullRequest.PROP_SUBMITTER);return builder.equal(attribute, User.get());diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.javaindex 4e6549bfe2..f3dd1a03f8 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -20,7 +21,7 @@ public class TargetBranchCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Path<String> attribute = root.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.javaindex 71084da13b..0528415010 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -24,7 +25,7 @@ public class TargetProjectCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Path<Project> project = root.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.javaindex fa4474c3da..4b3e144ecc 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@@ -1,6 +1,7 @@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.Predicate;import javax.persistence.criteria.Root;@@ -20,7 +21,7 @@ public class TitleCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Expression<String> attribute = root.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.javaindex a88c2ad4a4..d804cc8e4c 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -25,7 +26,7 @@ public class ToBeReviewedByCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Join<?, ?> join = root.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);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.javaindex 4309662350..01946080ef 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -20,7 +21,7 @@ public class ToBeReviewedByMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {if (User.get() != null) {Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.javaindex cf2bf31ed6..0fcdebcf53 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@@ -1,6 +1,7 @@package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;@@ -17,7 +18,7 @@ public class ToBeVerifiedByBuildsCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(PullRequest.PROP_BUILDS, JoinType.LEFT);Path<?> status = join.get(Build.PROP_STATUS);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.javaindex 3719e91193..e97394460c 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@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.pullrequest;import java.util.Date;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;@@ -29,7 +30,7 @@ public class UpdateDateCriteria extends EntityCriteria<PullRequest> {}@Override- public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {+ public Predicate getPredicate(CriteriaQuery<?> query, Root<PullRequest> root, CriteriaBuilder builder) {Path<Date> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);if (operator == PullRequestQueryLexer.IsUntil)return builder.lessThan(attribute, date);diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex fc560c8c0c..351076d50f 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -1,20 +1,8 @@package io.onedev.server.web.behavior;-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.FixedInCurrentBuild;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentPullRequest;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInBuild;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInPullRequest;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentCommit;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedBy;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedByMe;import static io.onedev.server.model.Issue.NAME_COMMENT;import static io.onedev.server.model.Issue.NAME_COMMENT_COUNT;import static io.onedev.server.model.Issue.NAME_DESCRIPTION;-import static io.onedev.server.model.Issue.NAME_MILESTONE;import static io.onedev.server.model.Issue.NAME_NUMBER;import static io.onedev.server.model.Issue.NAME_PROJECT;import static io.onedev.server.model.Issue.NAME_STATE;@@ -22,7 +10,18 @@ import static io.onedev.server.model.Issue.NAME_SUBMIT_DATE;import static io.onedev.server.model.Issue.NAME_TITLE;import static io.onedev.server.model.Issue.NAME_UPDATE_DATE;import static io.onedev.server.model.Issue.NAME_VOTE_COUNT;+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.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.OrderBy;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedBy;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedByMe;import java.util.ArrayList;import java.util.List;@@ -48,6 +47,8 @@ import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.field.spec.BooleanField;@@ -57,8 +58,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;@@ -66,7 +67,6 @@ import io.onedev.server.search.entity.issue.IssueQueryParser;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.DateUtils;-import io.onedev.server.model.Issue;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -211,7 +211,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {}} else if (fieldName.equals(NAME_NUMBER)) {return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);- } else if (fieldName.equals(NAME_MILESTONE)) {+ } else if (fieldName.equals(IssueSchedule.NAME_MILESTONE)) {if (project != null && !matchWith.contains("*"))return SuggestionUtils.suggestMilestones(project, matchWith);else@@ -280,7 +280,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {} else if (fieldName.equals(Issue.NAME_TITLE)|| fieldName.equals(Issue.NAME_DESCRIPTION)|| fieldName.equals(Issue.NAME_COMMENT)- || fieldName.equals(Issue.NAME_MILESTONE)) {+ || fieldName.equals(IssueSchedule.NAME_MILESTONE)) {hints.add("Use '*' for wildcard match");hints.add("Use '\\' to escape quotes");}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.javaindex 7f85d586bd..8ef365ef13 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java@@ -107,6 +107,8 @@ class IssueChangePanel extends GenericPanel<IssueChange> {});} else {add(new WebMarkupContainer("comment").setVisible(false));+ if (detail == null)+ add(AttributeAppender.append("class", "no-body"));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.cssindex 40aa1a7a09..bdd987a612 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css@@ -37,6 +37,12 @@.issue-activities>table>tbody>tr>td.content>.body>.detail+.comment {margin-top: 1rem;}+.issue-activities>table>tbody>tr>td.content.no-body {+ vertical-align: middle;+}+.issue-activities>table>tbody>tr>td.content.no-body>.body {+ display: none;+}.issue-activities table.field-compare {border: 1px dashed var(--secondary) !important;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.htmlindex 037a6baf8c..ed60ffc640 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html@@ -9,12 +9,10 @@<label class="control-label">Description</label><div wicket:id="description"></div></div>- <wicket:enclosure child="milestone">+ <wicket:enclosure child="milestones"><div class="form-group">- <label class="control-label">Milestone</label>- <div>- <input wicket:id="milestone" type="hidden" class="form-control">- </div>+ <label class="control-label">Milestones</label>+ <input wicket:id="milestones" type="hidden" class="form-control"></div></wicket:enclosure><div wicket:id="fields"></div>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.javaindex 5724fbc1ac..5724741915 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@@ -31,6 +31,7 @@ import com.google.common.base.Objects;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;@@ -45,7 +46,7 @@ import io.onedev.server.util.ComponentContext;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.component.markdown.AttachmentSupport;-import io.onedev.server.web.component.milestone.choice.MilestoneSingleChoice;+import io.onedev.server.web.component.milestone.choice.MilestoneMultiChoice;import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;import io.onedev.server.web.component.project.comment.CommentInput;import io.onedev.server.web.editable.BeanContext;@@ -62,7 +63,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementprivate CommentInput descriptionInput;- private MilestoneSingleChoice milestoneChoice;+ private MilestoneMultiChoice milestoneChoice;private BeanEditor fieldEditor;@@ -111,7 +112,8 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementlastDescriptionTemplate = getDescriptionTemplate(issue);add(descriptionInput = newDescriptionInput(lastDescriptionTemplate));- milestoneChoice = new MilestoneSingleChoice("milestone", Model.of(issue.getMilestone()),+ Collection<Milestone> milestones = issue.getMilestones();+ milestoneChoice = new MilestoneMultiChoice("milestones", Model.of(milestones),new LoadableDetachableModel<Collection<Milestone>>() {@Override@@ -281,7 +283,12 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementIssue issue = newIssue();issue.setTitle(titleInput.getConvertedInput());issue.setDescription(descriptionInput.getConvertedInput());- issue.setMilestone(milestoneChoice.getConvertedInput());+ for (Milestone milestone: milestoneChoice.getConvertedInput()) {+ IssueSchedule schedule = new IssueSchedule();+ schedule.setMilestone(milestone);+ schedule.setIssue(issue);+ issue.getSchedules().add(schedule);+ }fieldEditor.convertInput();Collection<String> fieldNames = FieldUtils.getEditableFields(getProject(),diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex afdd2113bb..84af5c6d44 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -2,11 +2,13 @@ package io.onedev.server.web.component.issue.list;import java.io.Serializable;import java.util.ArrayList;+import java.util.Collection;import java.util.HashSet;import java.util.Iterator;import java.util.List;import java.util.Map;import java.util.Set;+import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -27,7 +29,6 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.PropertyModel;-import com.google.common.base.Optional;import com.google.common.collect.Lists;import io.onedev.server.OneDev;@@ -50,6 +51,7 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PropertyDescriptor;+import static io.onedev.server.web.component.issue.list.BuiltInFieldsBean.*;@SuppressWarnings("serial")abstract class BatchEditPanel extends Panel implements InputContext {@@ -108,15 +110,15 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overridepublic Boolean getObject() {- return selectedFields.contains(Issue.NAME_STATE);+ return selectedFields.contains(NAME_STATE);}@Overridepublic void setObject(Boolean object) {if (object)- selectedFields.add(Issue.NAME_STATE);+ selectedFields.add(NAME_STATE);else- selectedFields.remove(Issue.NAME_STATE);+ selectedFields.remove(NAME_STATE);}}).add(newOnChangeBehavior(form)));@@ -129,15 +131,15 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overridepublic Boolean getObject() {- return selectedFields.contains(Issue.NAME_MILESTONE);+ return selectedFields.contains(NAME_MILESTONES);}@Overridepublic void setObject(Boolean object) {if (object)- selectedFields.add(Issue.NAME_MILESTONE);+ selectedFields.add(NAME_MILESTONES);else- selectedFields.remove(Issue.NAME_MILESTONE);+ selectedFields.remove(NAME_MILESTONES);}}).add(newOnChangeBehavior(form)));@@ -183,7 +185,8 @@ abstract class BatchEditPanel extends Panel implements InputContext {issue.setProject(getProject());if (getIssueQuery() != null && getIssueQuery().getCriteria() != null) {getIssueQuery().getCriteria().fill(issue);- builtInFieldsBean.setMilestone(issue.getMilestoneName());+ builtInFieldsBean.setMilestones(issue.getMilestones().stream()+ .map(it->it.getName()).collect(Collectors.toList()));customFieldsBean = issue.getFieldBean(fieldBeanClass, false);} else {try {@@ -195,10 +198,10 @@ abstract class BatchEditPanel extends Panel implements InputContext {}Set<String> excludedProperties = new HashSet<>();- if (!selectedFields.contains(Issue.NAME_STATE))- excludedProperties.add(Issue.PROP_STATE);- if (!selectedFields.contains(Issue.NAME_MILESTONE))- excludedProperties.add(Issue.PROP_MILESTONE);+ if (!selectedFields.contains(NAME_STATE))+ excludedProperties.add(PROP_STATE);+ if (!selectedFields.contains(NAME_MILESTONES))+ excludedProperties.add(PROP_MILESTONES);builtInFieldsEditor = BeanContext.edit("builtInFieldsEditor", builtInFieldsBean, excludedProperties, true);form.add(builtInFieldsEditor);@@ -245,21 +248,27 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overrideprotected void runTask(AjaxRequestTarget target) {String state;- if (selectedFields.contains(Issue.NAME_STATE))+ if (selectedFields.contains(NAME_STATE))state = builtInFieldsBean.getState();elsestate = null;- Optional<Milestone> milestone;- if (selectedFields.contains(Issue.NAME_MILESTONE))- milestone = Optional.fromNullable(getProject().getHierarchyMilestone(builtInFieldsBean.getMilestone()));- else- milestone = null;+ Collection<Milestone> milestones;+ if (selectedFields.contains(NAME_MILESTONES)) {+ milestones = new ArrayList<>();+ for (String each: builtInFieldsBean.getMilestones()) {+ Milestone milestone = getProject().getHierarchyMilestone(each);+ if (milestone != null)+ milestones.add(milestone);+ }+ } else {+ milestones = null;+ }Map<String, Object> fieldValues = FieldUtils.getFieldValues(customFieldsEditor.newComponentContext(),customFieldsBean, selectedFields);OneDev.getInstance(IssueChangeManager.class).batchUpdate(- getIssueIterator(), state, milestone, fieldValues, comment);+ getIssueIterator(), state, milestones, fieldValues, comment);onUpdated(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.javaindex 0c13cb5ffe..1793a092f8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java@@ -18,9 +18,17 @@ public class BuiltInFieldsBean implements Serializable {private static final long serialVersionUID = 1L;+ public static final String NAME_STATE = "State";++ public static final String NAME_MILESTONES = "Milestones";++ public static final String PROP_STATE = "state";++ public static final String PROP_MILESTONES = "milestones";+private String state;- private String milestone;+ private List<String> milestones;@Editable(order=100)@ChoiceProvider("getStateChoices")@@ -35,12 +43,12 @@ public class BuiltInFieldsBean implements Serializable {@Editable(order=200)@MilestoneChoice- public String getMilestone() {- return milestone;+ public List<String> getMilestones() {+ return milestones;}- public void setMilestone(String milestone) {- this.milestone = milestone;+ public void setMilestones(List<String> milestones) {+ this.milestones = milestones;}@SuppressWarnings("unused")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.htmlindex 4557deae2b..07b01a1850 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@@ -10,9 +10,23 @@</table></div></div>- <div class="milestone">- <div class="head">Milestone</div>- <div wicket:id="milestone" class="body"></div>+ <div wicket:id="milestones" class="milestones">+ <div class="head">Milestones</div>+ <ul class="body list-unstyled mb-0">+ <li wicket:id="milestones">+ <div class="d-flex align-items-center">+ <a wicket:id="link" class="mr-3"><span wicket:id="label"></span></a>+ <span wicket:id="status" class="status mr-3"></span>+ <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger ml-auto flex-shrink-0" title="Change milestone"><wicket:svg href="trash" class="icon icon-sm"></wicket:svg></a>+ </div>+ <div wicket:id="progress" class="mt-3"></div>+ </li>+ <wicket:enclosure>+ <li class="add">+ <input wicket:id="add" type="hidden" class="form-control">+ </li>+ </wicket:enclosure>+ </ul></div><div wicket:id="votes" class="votes"><div class="head">@@ -41,21 +55,4 @@<wicket:fragment wicket:id="nonEmptyValuesFrag"><div wicket:id="values" class="value"><span wicket:id="value"></span></div></wicket:fragment>- <wicket:fragment wicket:id="milestoneViewFrag">- <div class="d-flex align-items-center">- <a wicket:id="link" class="mr-3"><span wicket:id="label"></span></a>- <span wicket:id="status" class="status mr-3"></span>- <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary edit action" title="Change milestone"><wicket:svg href="edit" class="icon mr-2"></wicket:svg></a>- </div>- <div wicket:id="progress" class="mt-3"></div>- </wicket:fragment>- <wicket:fragment wicket:id="milestoneEditFrag">- <form wicket:id="form">- <input wicket:id="milestone" type="hidden" class="form-control">- <div class="mt-4">- <a wicket:id="save" class="dirty-aware btn btn-primary btn-sm mr-1">Save</a>- <a wicket:id="cancel" class="btn btn-secondary btn-sm">Cancel</a>- </div>- </form>- </wicket:fragment></wicket:panel>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.javaindex 92e1f53048..923a985c4a 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@@ -12,25 +12,22 @@ import java.util.stream.Collectors;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseAtInterceptPageException;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Lists;@@ -52,7 +49,11 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Input;+import io.onedev.server.util.match.MatchScoreProvider;+import io.onedev.server.util.match.MatchScoreUtils;+import io.onedev.server.web.WebConstants;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.entity.reference.ReferencePanel;import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;@@ -60,7 +61,11 @@ import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;import io.onedev.server.web.component.issue.statestats.StateStatsBar;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.milestone.MilestoneStatusLabel;-import io.onedev.server.web.component.milestone.choice.MilestoneSingleChoice;+import io.onedev.server.web.component.milestone.choice.AbstractMilestoneChoiceProvider;+import io.onedev.server.web.component.milestone.choice.MilestoneChoiceResourceReference;+import io.onedev.server.web.component.select2.Response;+import io.onedev.server.web.component.select2.ResponseFiller;+import io.onedev.server.web.component.select2.SelectToAddChoice;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.list.SimpleUserListLink;@@ -79,7 +84,7 @@ public abstract class IssueSidePanel extends Panel {@Overrideprotected void onBeforeRender() {addOrReplace(newFieldsContainer());- addOrReplace(newMilestoneContainer());+ addOrReplace(newMilestonesContainer());addOrReplace(newVotesContainer());addOrReplace(new EntityWatchesPanel("watches") {@@ -188,113 +193,142 @@ public abstract class IssueSidePanel extends Panel {};}- private Component newMilestoneContainer() {- Fragment fragment = new Fragment("milestone", "milestoneViewFrag", this);- if (getIssue().getMilestone() != null) {- Link<Void> link = new BookmarkablePageLink<Void>("link", MilestoneIssuesPage.class,- MilestoneIssuesPage.paramsOf(getProject(), getIssue().getMilestone(), null));- link.add(new Label("label", getIssue().getMilestone().getName()));- fragment.add(new StateStatsBar("progress", new AbstractReadOnlyModel<Map<String, Integer>>() {-- @Override- public Map<String, Integer> getObject() {- return getIssue().getMilestone().getStateStats(getProject());- }-- }) {-- @Override- protected Link<Void> newStateLink(String componentId, String state) {- String query = new IssueQuery(new StateCriteria(state)).toString();- PageParameters params = MilestoneIssuesPage.paramsOf(getProject(), getIssue().getMilestone(), query);- return new ViewStateAwarePageLink<Void>(componentId, MilestoneIssuesPage.class, params);- }-- });- fragment.add(link);- fragment.add(new MilestoneStatusLabel("status", new AbstractReadOnlyModel<Milestone>() {+ private Component newMilestonesContainer() {+ WebMarkupContainer container = new WebMarkupContainer("milestones") {- @Override- public Milestone getObject() {- return getIssue().getMilestone();- }-- }));- } else {- WebMarkupContainer link = new WebMarkupContainer("link") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("span");- }-- };- link.add(new Label("label", "<i>No milestone</i>").setEscapeModelStrings(false));- fragment.add(new WebMarkupContainer("status").setVisible(false));- fragment.add(new WebMarkupContainer("progress").setVisible(false));- fragment.add(link);- }+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getIssue().getSchedules().isEmpty() || SecurityUtils.canScheduleIssues(getProject()));+ }++ };++ container.add(new ListView<Milestone>("milestones", new AbstractReadOnlyModel<List<Milestone>>() {- fragment.add(new AjaxLink<Void>("edit") {+ @Override+ public List<Milestone> getObject() {+ return getIssue().getMilestones().stream()+ .sorted(new Milestone.DatesAndStatusComparator())+ .collect(Collectors.toList());+ }++ }) {@Override- public void onClick(AjaxRequestTarget target) {- Fragment fragment = new Fragment("milestone", "milestoneEditFrag", IssueSidePanel.this);- Form<?> form = new Form<Void>("form");+ protected void populateItem(ListItem<Milestone> item) {+ Milestone milestone = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<Void>("link", MilestoneIssuesPage.class,+ MilestoneIssuesPage.paramsOf(getIssue().getProject(), milestone, null));+ link.add(new Label("label", milestone.getName()));+ item.add(link);- MilestoneSingleChoice choice = new MilestoneSingleChoice("milestone",- Model.of(getIssue().getMilestone()),- new LoadableDetachableModel<Collection<Milestone>>() {+ item.add(new StateStatsBar("progress", new AbstractReadOnlyModel<Map<String, Integer>>() {@Override- protected Collection<Milestone> load() {- return getProject().getSortedHierarchyMilestones();+ public Map<String, Integer> getObject() {+ return item.getModelObject().getStateStats(getIssue().getProject());}- });- choice.setRequired(false);-- form.add(choice);+ }) {- form.add(new AjaxButton("save") {+ @Override+ protected Link<Void> newStateLink(String componentId, String state) {+ String query = new IssueQuery(new StateCriteria(state)).toString();+ PageParameters params = MilestoneIssuesPage.paramsOf(getIssue().getProject(),+ item.getModelObject(), query);+ return new ViewStateAwarePageLink<Void>(componentId, MilestoneIssuesPage.class, params);+ }++ });+ item.add(new MilestoneStatusLabel("status", new AbstractReadOnlyModel<Milestone>() {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);- Milestone milestone = choice.getModelObject();- getIssueChangeManager().changeMilestone(getIssue(), milestone);- Component container = newMilestoneContainer();- IssueSidePanel.this.replace(container);- target.add(container);+ public Milestone getObject() {+ return item.getModelObject();}++ }));++ item.add(new AjaxLink<Void>("delete") {+ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ if (!getIssue().isNew()) {+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to "+ + "remove the issue from milestone '" + item.getModelObject().getName() + "'?"));+ }+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ getIssueChangeManager().removeFromMilestone(getIssue(), item.getModelObject());+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canScheduleIssues(getIssue().getProject()));+ }+});- form.add(new AjaxLink<Void>("cancel") {+ }++ });++ container.add(new SelectToAddChoice<Milestone>("add", new AbstractMilestoneChoiceProvider() {++ @Override+ public void query(String term, int page, Response<Milestone> response) {+ List<Milestone> milestones = getProject().getSortedHierarchyMilestones();+ milestones.removeAll(getIssue().getMilestones());++ milestones = MatchScoreUtils.filterAndSort(+ milestones, new MatchScoreProvider<Milestone>() {@Override- public void onClick(AjaxRequestTarget target) {- Component container = newMilestoneContainer();- IssueSidePanel.this.replace(container);- target.add(container);+ public double getMatchScore(Milestone object) {+ return MatchScoreUtils.getMatchScore(object.getName(), term);}});- fragment.add(form);- fragment.setOutputMarkupId(true);- IssueSidePanel.this.replace(fragment);- target.add(fragment);+ new ResponseFiller<Milestone>(response).fill(milestones, page, WebConstants.PAGE_SIZE);}++ }) {+ @Override+ protected void onInitialize() {+ super.onInitialize();++ getSettings().setPlaceholder("Add to milestone...");+ getSettings().setFormatResult("onedev.server.milestoneChoiceFormatter.formatResult");+ getSettings().setFormatSelection("onedev.server.milestoneChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("onedev.server.milestoneChoiceFormatter.escapeMarkup");+ }+@Overrideprotected void onConfigure() {super.onConfigure();setVisible(SecurityUtils.canScheduleIssues(getIssue().getProject()));}++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new MilestoneChoiceResourceReference()));+ }- });- fragment.setOutputMarkupId(true);- return fragment;+ @Override+ protected void onSelect(AjaxRequestTarget target, Milestone milestone) {+ getIssueChangeManager().addToMilestone(getIssue(), milestone);+ }++ });++ return container;}private List<IssueVote> getSortedVotes() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css b/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.cssindex 7958f4d3cb..fa5752e946 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css@@ -35,3 +35,6 @@.issue-side>.fields .field-values.editable {border-color: transparent;}+.issue-side>.milestones li+li {+ padding-top: 1.2rem;+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/AbstractMilestoneChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/AbstractMilestoneChoiceProvider.javanew file mode 100644index 0000000000..6124d8df9d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/AbstractMilestoneChoiceProvider.java@@ -0,0 +1,45 @@+package io.onedev.server.web.component.milestone.choice;++import java.util.Collection;+import java.util.List;++import org.hibernate.Hibernate;+import org.json.JSONException;+import org.json.JSONWriter;+import org.unbescape.html.HtmlEscape;++import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.MilestoneManager;+import io.onedev.server.model.Milestone;+import io.onedev.server.web.component.select2.ChoiceProvider;++public abstract class AbstractMilestoneChoiceProvider extends ChoiceProvider<Milestone> {++ private static final long serialVersionUID = 1L;++ @Override+ public void toJson(Milestone choice, JSONWriter writer) throws JSONException {+ writer.key("id").value(choice.getId()).key("name").value(HtmlEscape.escapeHtml5(choice.getName()));+ writer.key("statusName").value(choice.getStatusName());+ if (choice.isClosed())+ writer.key("statusClass").value("badge-success");+ else+ writer.key("statusClass").value("badge-warning");+ }++ @Override+ public Collection<Milestone> toChoices(Collection<String> ids) {+ List<Milestone> milestones = Lists.newArrayList();+ MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);+ for (String each : ids) {+ Milestone milestone = milestoneManager.load(Long.valueOf(each));+ Hibernate.initialize(milestone);+ milestones.add(milestone);+ }++ return milestones;+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.javaindex 63469ffc0c..0553c72864 100644--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java@@ -4,24 +4,15 @@ import java.util.Collection;import java.util.List;import org.apache.wicket.model.IModel;-import org.hibernate.Hibernate;-import org.json.JSONException;-import org.json.JSONWriter;-import org.unbescape.html.HtmlEscape;-import com.google.common.collect.Lists;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.util.match.MatchScoreProvider;import io.onedev.server.util.match.MatchScoreUtils;import io.onedev.server.web.WebConstants;-import io.onedev.server.web.component.select2.ChoiceProvider;import io.onedev.server.web.component.select2.Response;import io.onedev.server.web.component.select2.ResponseFiller;-public class MilestoneChoiceProvider extends ChoiceProvider<Milestone> {+public class MilestoneChoiceProvider extends AbstractMilestoneChoiceProvider {private static final long serialVersionUID = 1L;@@ -37,29 +28,6 @@ public class MilestoneChoiceProvider extends ChoiceProvider<Milestone> {super.detach();}- @Override- public void toJson(Milestone choice, JSONWriter writer) throws JSONException {- writer.key("id").value(choice.getId()).key("name").value(HtmlEscape.escapeHtml5(choice.getName()));- writer.key("statusName").value(choice.getStatusName());- if (choice.isClosed())- writer.key("statusClass").value("badge-success");- else- writer.key("statusClass").value("badge-warning");- }-- @Override- public Collection<Milestone> toChoices(Collection<String> ids) {- List<Milestone> milestones = Lists.newArrayList();- MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);- for (String each : ids) {- Milestone milestone = milestoneManager.load(Long.valueOf(each));- Hibernate.initialize(milestone);- milestones.add(milestone);- }-- return milestones;- }-@Overridepublic void query(String term, int page, Response<Milestone> response) {List<Milestone> milestones = MatchScoreUtils.filterAndSort(choicesModel.getObject(),diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneMultiChoice.javanew file mode 100644index 0000000000..ce01fd89c1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneMultiChoice.java@@ -0,0 +1,40 @@+package io.onedev.server.web.component.milestone.choice;++import java.util.Collection;++import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.model.IModel;++import io.onedev.server.model.Milestone;+import io.onedev.server.web.component.select2.Select2MultiChoice;++public class MilestoneMultiChoice extends Select2MultiChoice<Milestone> {++ private static final long serialVersionUID = 1L;++ public MilestoneMultiChoice(String id, IModel<Collection<Milestone>> selectionsModel, IModel<Collection<Milestone>>choicesModel) {+ super(id, selectionsModel, new MilestoneChoiceProvider(choicesModel));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (isRequired())+ getSettings().setPlaceholder("Choose milestones...");+ else+ getSettings().setPlaceholder("Not specified");+ getSettings().setFormatResult("onedev.server.milestoneChoiceFormatter.formatResult");+ getSettings().setFormatSelection("onedev.server.milestoneChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("onedev.server.milestoneChoiceFormatter.escapeMarkup");+ setConvertEmptyInputStringToNull(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new MilestoneChoiceResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneChoiceEditSupport.javaindex f1c130e089..9e7e7bed1b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneChoiceEditSupport.java@@ -1,11 +1,14 @@package io.onedev.server.web.editable.milestonechoice;import java.lang.reflect.Method;+import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;+import org.eclipse.jgit.util.StringUtils;+import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;@@ -22,7 +25,34 @@ public class MilestoneChoiceEditSupport implements EditSupport {Method propertyGetter = descriptor.getPropertyGetter();MilestoneChoice milestoneChoice = propertyGetter.getAnnotation(MilestoneChoice.class);if (milestoneChoice != null) {- if (propertyGetter.getReturnType() == String.class) {+ if (List.class.isAssignableFrom(propertyGetter.getReturnType())+ && ReflectionUtils.getCollectionElementClass(propertyGetter.getGenericReturnType()) == String.class) {+ return new PropertyContext<List<String>>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<List<String>> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ List<String> milestoneNames = model.getObject();+ if (milestoneNames != null && !milestoneNames.isEmpty()) {+ return new Label(id, StringUtils.join(milestoneNames, ", " ));+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<List<String>> renderForEdit(String componentId, IModel<List<String>> model) {+ return new MilestoneMultiChoiceEditor(componentId, descriptor, model);+ }++ };+ } else if (propertyGetter.getReturnType() == String.class) {return new PropertyContext<String>(descriptor) {@Override@@ -48,7 +78,7 @@ public class MilestoneChoiceEditSupport implements EditSupport {};} else {- throw new RuntimeException("Annotation 'MilestoneChoice' should be applied to property with type 'String'");+ throw new RuntimeException("Annotation 'MilestoneChoice' should be applied to property with type 'String' or 'List<String>'");}} else {return null;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.htmlnew file mode 100644index 0000000000..f1c90cbe9e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.html@@ -0,0 +1,3 @@+<wicket:panel>+ <input wicket:id="input" type="hidden"></input>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.javanew file mode 100644index 0000000000..ea30ab8434--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.java@@ -0,0 +1,108 @@+package io.onedev.server.web.editable.milestonechoice;++import java.util.ArrayList;+import java.util.Collection;+import java.util.List;+import java.util.stream.Collectors;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import com.google.common.base.Preconditions;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.MilestoneManager;+import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;+import io.onedev.server.util.ComponentContext;+import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.web.component.milestone.choice.MilestoneMultiChoice;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.annotation.MilestoneChoice;++@SuppressWarnings("serial")+public class MilestoneMultiChoiceEditor extends PropertyEditor<List<String>> {++ private MilestoneMultiChoice input;++ public MilestoneMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ IModel<List<String>> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @SuppressWarnings({"unchecked" })+ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<Milestone> choices = new ArrayList<>();++ ComponentContext componentContext = new ComponentContext(this);+ ComponentContext.push(componentContext);+ try {+ MilestoneChoice milestoneChoice = descriptor.getPropertyGetter().getAnnotation(MilestoneChoice.class);+ Preconditions.checkNotNull(milestoneChoice);+ if (milestoneChoice.value().length() != 0) {+ choices.addAll((List<Milestone>)ReflectionUtils+ .invokeStaticMethod(descriptor.getBeanClass(), milestoneChoice.value()));+ } else {+ choices.addAll(Project.get().getSortedHierarchyMilestones());+ }+ } finally {+ ComponentContext.pop();+ }++ List<Milestone> selections = new ArrayList<>();+ if (getModelObject() != null) {+ MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);+ for (String milestoneName: getModelObject()) {+ Milestone milestone = milestoneManager.findInHierarchy(Project.get(), milestoneName);+ if (milestone != null && choices.contains(milestone))+ selections.add(milestone);+ }+ }++ input = new MilestoneMultiChoice("input", Model.of(selections), Model.of(choices)) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().configurePlaceholder(descriptor);+ }++ };++ input.setRequired(descriptor.isPropertyRequired());+ input.setLabel(Model.of(getDescriptor().getDisplayName()));++ input.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });++ add(input);+ }++ @Override+ protected List<String> convertInputToValue() throws ConversionException {+ Collection<Milestone> milestones = input.getConvertedInput();+ if (milestones != null)+ return milestones.stream().map(it->it.getName()).collect(Collectors.toList());+ else+ return new ArrayList<>();+ }++ @Override+ public boolean needExplicitSubmit() {+ return true;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.javaindex 38b654a13c..101918f46c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java@@ -51,7 +51,6 @@ import io.onedev.server.OneDev;import io.onedev.server.model.AbstractEntity;import io.onedev.server.rest.annotation.Api;import io.onedev.server.rest.annotation.EntityCreate;-import io.onedev.server.rest.annotation.EntityId;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;@@ -253,29 +252,7 @@ public class ExampleValuePanel extends Panel {fragment.add(typeHintFrag);hasHint = true;} else if (getField() != null) {- if (getField().getAnnotation(ManyToOne.class) != null- || getField().getAnnotation(JoinColumn.class) != null- || getField().getAnnotation(EntityId.class) != null) {- Class<?> entityClass;- if (getValue() instanceof AbstractEntity)- entityClass = getValue().getClass();- else- entityClass = getField().getAnnotation(EntityId.class).value();- Class<?> resourceClass = resourceMap.get(entityClass);- if (resourceClass != null) {- Fragment typeHintFrag = new Fragment("typeHint", "entityIdHintFrag", this);- Link<Void> link = new ViewStateAwarePageLink<Void>("entity", ResourceDetailPage.class,- ResourceDetailPage.paramsOf(resourceClass));- link.add(new Label("label", WordUtils.uncamel(entityClass.getSimpleName()).toLowerCase()));- typeHintFrag.add(link);- fragment.add(typeHintFrag);- hasHint = true;- } else {- fragment.add(new WebMarkupContainer("typeHint").setVisible(false));- }- } else {- fragment.add(new WebMarkupContainer("typeHint").setVisible(false));- }+ fragment.add(new WebMarkupContainer("typeHint").setVisible(false));} else if (getValue() instanceof Long&& getValueOrigin() == ValueInfo.Origin.RESPONSE_BODY&& requestBodyClass != null) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex c647ca7b6c..7f826a31eb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -27,10 +27,12 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;+import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.search.entity.issue.MilestoneIsEmptyCriteria;+import io.onedev.server.search.entity.issue.MilestoneCriteria;+import io.onedev.server.search.entity.issue.NotIssueCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.modal.ModalLink;@@ -49,7 +51,7 @@ abstract class BacklogColumnPanel extends Panel {List<IssueCriteria> criterias = new ArrayList<>();if (backlogQuery.getCriteria() != null)criterias.add(backlogQuery.getCriteria());- criterias.add(new MilestoneIsEmptyCriteria());+ criterias.add(new NotIssueCriteria(new MilestoneCriteria(getMilestone().getName())));return new IssueQuery(IssueCriteria.and(criterias), backlogQuery.getSorts());} else {return null;@@ -151,7 +153,7 @@ abstract class BacklogColumnPanel extends Panel {Issue issue = OneDev.getInstance(IssueManager.class).load(params.getParameterValue("issue").toLong());if (!SecurityUtils.canScheduleIssues(issue.getProject()))throw new UnauthorizedException("Permission denied");- OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, null);+ OneDev.getInstance(IssueChangeManager.class).removeFromMilestone(issue, getMilestone());target.appendJavaScript(String.format("onedev.server.issueBoards.markAccepted(%d, true);", issue.getId()));}@@ -172,7 +174,7 @@ abstract class BacklogColumnPanel extends Panel {Issue issue = issueDragging.getIssue();if (SecurityUtils.canScheduleIssues(issue.getProject())) {issue = SerializationUtils.clone(issue);- issue.setMilestone(null);+ issue.removeFromMilestone(getMilestone());}if (getQuery().matches(issue)) {String script = String.format("$('#%s').addClass('issue-droppable');", getMarkupId());@@ -228,4 +230,6 @@ abstract class BacklogColumnPanel extends Panel {@Nullableprotected abstract IssueQuery getBacklogQuery();+ protected abstract Milestone getMilestone();+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex 64cd7e0820..038f093644 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -24,6 +24,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;+import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.field.spec.FieldSpec;@@ -294,9 +295,10 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {.getParameterValue("issue").toLong();Issue issue = OneDev.getInstance(IssueManager.class).load(issueId);Hibernate.initialize(issue.getProject());- Hibernate.initialize(issue.getMilestone());Hibernate.initialize(issue.getFields());Hibernate.initialize(issue.getSubmitter());+ for (Milestone milestone: issue.getMilestones())+ Hibernate.initialize(milestone);send(getPage(), Broadcast.BREADTH, new IssueDragging(target, issue));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 9d2e54df32..df3704b619 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -6,7 +6,6 @@ import java.util.Collection;import java.util.HashMap;import java.util.List;import java.util.Map;-import java.util.Objects;import java.util.concurrent.atomic.AtomicReference;import javax.annotation.Nullable;@@ -39,6 +38,7 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -159,7 +159,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (event.getPayload() instanceof IssueDragging && getQuery() != null) {IssueDragging issueDragging = (IssueDragging) event.getPayload();Issue issue = issueDragging.getIssue();- if (Objects.equals(issue.getMilestone(), getMilestone())) {+ if (getMilestone() == null || issue.getMilestones().contains(getMilestone())) {// move issue between board columnsString identifyField = getBoard().getIdentifyField();if (identifyField.equals(Issue.NAME_STATE)) {@@ -180,7 +180,10 @@ abstract class BoardColumnPanel extends Panel implements EditContext {} else if (SecurityUtils.canScheduleIssues(issue.getProject())) {// move issue between backlog column and board columnissue = SerializationUtils.clone(issue);- issue.setMilestone(getMilestone());+ IssueSchedule schedule = new IssueSchedule();+ schedule.setIssue(issue);+ schedule.setMilestone(getMilestone());+ issue.getSchedules().add(schedule);}if (getQuery().matches(issue)) {String script = String.format("$('#%s').addClass('issue-droppable');", getMarkupId());@@ -345,12 +348,12 @@ abstract class BoardColumnPanel extends Panel implements EditContext {Long issueId = params.getParameterValue("issue").toLong();Issue issue = getIssueManager().load(issueId);String fieldName = getBoard().getIdentifyField();- if (issue.getMilestone() == null && getMilestone() != null) {+ if (getMilestone() != null && !issue.getMilestones().contains(getMilestone())) {// move a backlog issue to boardif (!SecurityUtils.canScheduleIssues(issue.getProject()))throw new UnauthorizedException("Permission denied");-- OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, getMilestone());++ OneDev.getInstance(IssueChangeManager.class).addToMilestone(issue, getMilestone());markAccepted(target, issue, true);} else if (fieldName.equals(Issue.NAME_STATE)) {AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex 529d373f39..0c07d45626 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@@ -761,6 +761,11 @@ public class IssueBoardsPage extends ProjectIssuesPage {return backlogQueryModel.getObject();}+ @Override+ protected Milestone getMilestone() {+ return IssueBoardsPage.this.getMilestone();+ }+});}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneBurndownPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneBurndownPage.javaindex f476108c6b..af4bd2faf1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneBurndownPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneBurndownPage.java@@ -25,6 +25,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.infomanager.IssueInfoManager;import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;@@ -177,10 +178,12 @@ public class MilestoneBurndownPage extends MilestoneDetailPage {int dueDayValue = new Day(getMilestone().getDueDate()).getValue();Map<Integer, Map<String, Integer>> dailyStateWeights = new LinkedHashMap<>();- for (Issue issue: getMilestone().getIssues()) {+ for (IssueSchedule schedule: getMilestone().getSchedules()) {+ Issue issue = schedule.getIssue();int issueWeight = getFieldValue(issue);+ int scheduleDayValue = new Day(schedule.getDate()).getValue();Map<Integer, String> dailyStates = OneDev.getInstance(IssueInfoManager.class)- .getDailyStates(issue.getId(), startDayValue, dueDayValue);+ .getDailyStates(issue.getId(), Math.max(startDayValue, scheduleDayValue), dueDayValue);for (Map.Entry<Integer, String> entry: dailyStates.entrySet()) {Map<String, Integer> stateWeights = dailyStateWeights.get(entry.getKey());if (stateWeights == null) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.htmlindex 21d1cd40c8..84aa4f8780 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.html@@ -10,7 +10,7 @@<div wicket:id="actions" class="actions mr-4"></div><a wicket:id="create" class="mr-4">Create</a></div>- <div wicket:id="description" class="mt-4"></div>+ <div wicket:id="description" class="mt-4 mb-2 alert alert-light"></div><ul wicket:id="milestoneTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul><wicket:child></wicket:child></div>diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.javaindex 37920a6ecb..98343fa4b0 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.java@@ -36,6 +36,7 @@ import io.onedev.server.entityreference.ReferenceMigrator;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -176,7 +177,10 @@ public class ImportUtils {String milestoneName = issueNode.get("milestone").get("title").asText();Milestone milestone = milestoneMappings.get(milestoneName);if (milestone != null) {- issue.setMilestone(milestone);+ IssueSchedule schedule = new IssueSchedule();+ schedule.setIssue(issue);+ schedule.setMilestone(milestone);+ issue.getSchedules().add(schedule);} else {extraIssueInfo.put("Milestone", milestoneName);nonExistentMilestones.add(milestoneName);@@ -324,16 +328,19 @@ public class ImportUtils {if (!dryRun) {ReferenceMigrator migrator = new ReferenceMigrator(Issue.class, issueNumberMappings);+ Dao dao = OneDev.getInstance(Dao.class);for (Issue issue: issues) {if (issue.getDescription() != null)issue.setDescription(migrator.migratePrefixed(issue.getDescription(), "#"));-+OneDev.getInstance(IssueManager.class).save(issue);+ for (IssueSchedule schedule: issue.getSchedules())+ dao.persist(schedule);for (IssueField field: issue.getFields())- OneDev.getInstance(Dao.class).persist(field);+ dao.persist(field);for (IssueComment comment: issue.getComments()) {comment.setContent(migrator.migratePrefixed(comment.getContent(), "#"));- OneDev.getInstance(Dao.class).persist(comment);+ dao.persist(comment);}}}diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.javaindex c768cd6ba2..5563b54646 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.java@@ -37,6 +37,7 @@ import io.onedev.server.entityreference.ReferenceMigrator;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -164,7 +165,10 @@ public class ImportUtils {String milestoneName = issueNode.get("milestone").get("title").asText();Milestone milestone = milestoneMappings.get(milestoneName);if (milestone != null) {- issue.setMilestone(milestone);+ IssueSchedule schedule = new IssueSchedule();+ schedule.setIssue(issue);+ schedule.setMilestone(milestone);+ issue.getSchedules().add(schedule);} else {extraIssueInfo.put("Milestone", milestoneName);nonExistentMilestones.add(milestoneName);@@ -291,16 +295,19 @@ public class ImportUtils {if (!dryRun) {ReferenceMigrator migrator = new ReferenceMigrator(Issue.class, issueNumberMappings);+ Dao dao = OneDev.getInstance(Dao.class);for (Issue issue: issues) {if (issue.getDescription() != null)issue.setDescription(migrator.migratePrefixed(issue.getDescription(), "#"));OneDev.getInstance(IssueManager.class).save(issue);+ for (IssueSchedule schedule: issue.getSchedules())+ dao.persist(schedule);for (IssueField field: issue.getFields())- OneDev.getInstance(Dao.class).persist(field);+ dao.persist(field);for (IssueComment comment: issue.getComments()) {comment.setContent(migrator.migratePrefixed(comment.getContent(), "#"));- OneDev.getInstance(Dao.class).persist(comment);+ dao.persist(comment);}}}diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.javaindex 9ca04d2877..b2c1400d84 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.java@@ -41,6 +41,7 @@ import io.onedev.server.entityreference.ReferenceMigrator;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -217,7 +218,10 @@ public class ImportUtils {String milestoneName = issueNode.get("milestone").get("title").asText();Milestone milestone = milestoneMappings.get(milestoneName);if (milestone != null) {- issue.setMilestone(milestone);+ IssueSchedule schedule = new IssueSchedule();+ schedule.setIssue(issue);+ schedule.setMilestone(milestone);+ issue.getSchedules().add(schedule);} else {extraIssueInfo.put("Milestone", milestoneName);nonExistentMilestones.add(milestoneName);@@ -419,16 +423,19 @@ public class ImportUtils {if (!dryRun) {ReferenceMigrator migrator = new ReferenceMigrator(Issue.class, issueNumberMappings);+ Dao dao = OneDev.getInstance(Dao.class);for (Issue issue: issues) {if (issue.getDescription() != null)issue.setDescription(migrator.migratePrefixed(issue.getDescription(), "#"));OneDev.getInstance(IssueManager.class).save(issue);+ for (IssueSchedule schedule: issue.getSchedules())+ dao.persist(schedule);for (IssueField field: issue.getFields())- OneDev.getInstance(Dao.class).persist(field);+ dao.persist(field);for (IssueComment comment: issue.getComments()) {comment.setContent(migrator.migratePrefixed(comment.getContent(), "#"));- OneDev.getInstance(Dao.class).persist(comment);+ dao.persist(comment);}}}diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportUtils.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportUtils.javaindex ef1e6d68b1..d8de7731e3 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportUtils.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportUtils.java@@ -45,6 +45,7 @@ import io.onedev.server.entityreference.ReferenceMigrator;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.LastUpdate;@@ -657,16 +658,19 @@ public class ImportUtils {if (!dryRun) {ReferenceMigrator migrator = new ReferenceMigrator(Issue.class, issueNumberMappings);String jiraProjectKey = jiraProject.get("key").asText();+ Dao dao = OneDev.getInstance(Dao.class);for (Issue issue: issues) {if (issue.getDescription() != null)issue.setDescription(migrator.migratePrefixed(issue.getDescription(), jiraProjectKey + "-"));OneDev.getInstance(IssueManager.class).save(issue);+ for (IssueSchedule schedule: issue.getSchedules())+ dao.persist(schedule);for (IssueField field: issue.getFields())- OneDev.getInstance(Dao.class).persist(field);+ dao.persist(field);for (IssueComment comment: issue.getComments()) {comment.setContent(migrator.migratePrefixed(comment.getContent(), jiraProjectKey + "-"));- OneDev.getInstance(Dao.class).persist(comment);+ dao.persist(comment);}}}diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.javaindex cdb5a0bece..bcd5ba6993 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java@@ -38,6 +38,7 @@ import io.onedev.server.entityreference.ReferenceMigrator;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.LastUpdate;@@ -784,16 +785,19 @@ public class ImportUtils {if (!dryRun) {ReferenceMigrator migrator = new ReferenceMigrator(Issue.class, issueNumberMappings);+ Dao dao = OneDev.getInstance(Dao.class);for (Issue issue: issues) {if (issue.getDescription() != null)issue.setDescription(migrator.migratePrefixed(issue.getDescription(), youTrackProjectShortName + "-"));OneDev.getInstance(IssueManager.class).save(issue);+ for (IssueSchedule schedule: issue.getSchedules())+ dao.persist(schedule);for (IssueField field: issue.getFields())- OneDev.getInstance(Dao.class).persist(field);+ dao.persist(field);for (IssueComment comment: issue.getComments()) {comment.setContent(migrator.migratePrefixed(comment.getContent(), youTrackProjectShortName + "-"));- OneDev.getInstance(Dao.class).persist(comment);+ dao.persist(comment);}}}