Skip to content

The Unified and Autonomous Development Platform

feat: Improve issue and pull request fuzzy query to sort result by relevance (OD-2287)

Robin Shen167d94a2d58b
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index 1bd683d898..f554f64cc5 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -105,6 +105,7 @@ import io.onedev.server.entitymanager.CodeCommentMentionManager;
import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;
import io.onedev.server.entitymanager.CodeCommentReplyManager;
import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;
+import io.onedev.server.entitymanager.CodeCommentTouchManager;
import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;
import io.onedev.server.entitymanager.DashboardGroupShareManager;
import io.onedev.server.entitymanager.DashboardManager;
@@ -157,6 +158,7 @@ import io.onedev.server.entitymanager.PullRequestMentionManager;
import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;
import io.onedev.server.entitymanager.PullRequestReactionManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
+import io.onedev.server.entitymanager.PullRequestTouchManager;
import io.onedev.server.entitymanager.PullRequestUpdateManager;
import io.onedev.server.entitymanager.PullRequestWatchManager;
import io.onedev.server.entitymanager.ReviewedDiffManager;
@@ -185,6 +187,7 @@ import io.onedev.server.entitymanager.impl.DefaultCodeCommentMentionManager;
import io.onedev.server.entitymanager.impl.DefaultCodeCommentQueryPersonalizationManager;
import io.onedev.server.entitymanager.impl.DefaultCodeCommentReplyManager;
import io.onedev.server.entitymanager.impl.DefaultCodeCommentStatusChangeManager;
+import io.onedev.server.entitymanager.impl.DefaultCodeCommentTouchManager;
import io.onedev.server.entitymanager.impl.DefaultCommitQueryPersonalizationManager;
import io.onedev.server.entitymanager.impl.DefaultDashboardGroupShareManager;
import io.onedev.server.entitymanager.impl.DefaultDashboardManager;
@@ -237,6 +240,7 @@ import io.onedev.server.entitymanager.impl.DefaultPullRequestMentionManager;
import io.onedev.server.entitymanager.impl.DefaultPullRequestQueryPersonalizationManager;
import io.onedev.server.entitymanager.impl.DefaultPullRequestReactionManager;
import io.onedev.server.entitymanager.impl.DefaultPullRequestReviewManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestTouchManager;
import io.onedev.server.entitymanager.impl.DefaultPullRequestUpdateManager;
import io.onedev.server.entitymanager.impl.DefaultPullRequestWatchManager;
import io.onedev.server.entitymanager.impl.DefaultReviewedDiffManager;
@@ -319,8 +323,12 @@ import io.onedev.server.search.code.CodeIndexManager;
import io.onedev.server.search.code.CodeSearchManager;
import io.onedev.server.search.code.DefaultCodeIndexManager;
import io.onedev.server.search.code.DefaultCodeSearchManager;
+import io.onedev.server.search.entitytext.CodeCommentTextManager;
+import io.onedev.server.search.entitytext.DefaultCodeCommentTextManager;
import io.onedev.server.search.entitytext.DefaultIssueTextManager;
+import io.onedev.server.search.entitytext.DefaultPullRequestTextManager;
import io.onedev.server.search.entitytext.IssueTextManager;
+import io.onedev.server.search.entitytext.PullRequestTextManager;
import io.onedev.server.security.BasicAuthenticationFilter;
import io.onedev.server.security.BearerAuthenticationFilter;
import io.onedev.server.security.CodePullAuthorizationSource;
@@ -365,7 +373,6 @@ import io.onedev.server.web.DefaultWicketServlet;
import io.onedev.server.web.ResourcePackScopeContribution;
import io.onedev.server.web.UrlManager;
import io.onedev.server.web.WebApplication;
-import io.onedev.server.web.WebApplicationConfigurator;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.avatar.DefaultAvatarManager;
import io.onedev.server.web.component.diff.DiffRenderer;
@@ -377,12 +384,10 @@ import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EditSupportLocator;
import io.onedev.server.web.editable.EditSupportRegistry;
import io.onedev.server.web.exceptionhandler.PageExpiredExceptionHandler;
-import io.onedev.server.web.mapper.BasePageMapper;
import io.onedev.server.web.page.layout.AdministrationMenuContribution;
import io.onedev.server.web.page.layout.AdministrationSettingContribution;
import io.onedev.server.web.page.project.blob.render.BlobRenderer;
import io.onedev.server.web.page.project.setting.ProjectSettingContribution;
-import io.onedev.server.web.page.test.TestPage;
import io.onedev.server.web.upload.DefaultUploadManager;
import io.onedev.server.web.upload.UploadManager;
import io.onedev.server.web.websocket.AlertEventBroadcaster;
@@ -516,6 +521,8 @@ public class CoreModule extends AbstractPluginModule {
bind(EmailAddressManager.class).to(DefaultEmailAddressManager.class);
bind(GpgKeyManager.class).to(DefaultGpgKeyManager.class);
bind(IssueTextManager.class).to(DefaultIssueTextManager.class);
+ bind(PullRequestTextManager.class).to(DefaultPullRequestTextManager.class);
+ bind(CodeCommentTextManager.class).to(DefaultCodeCommentTextManager.class);
bind(PendingSuggestionApplyManager.class).to(DefaultPendingSuggestionApplyManager.class);
bind(IssueAuthorizationManager.class).to(DefaultIssueAuthorizationManager.class);
bind(DashboardManager.class).to(DefaultDashboardManager.class);
@@ -528,6 +535,8 @@ public class CoreModule extends AbstractPluginModule {
bind(PackLabelManager.class).to(DefaultPackLabelManager.class);
bind(PullRequestLabelManager.class).to(DefaultPullRequestLabelManager.class);
bind(IssueTouchManager.class).to(DefaultIssueTouchManager.class);
+ bind(PullRequestTouchManager.class).to(DefaultPullRequestTouchManager.class);
+ bind(CodeCommentTouchManager.class).to(DefaultCodeCommentTouchManager.class);
bind(AlertManager.class).to(DefaultAlertManager.class);
bind(UpdateCheckManager.class).to(DefaultUpdateCheckManager.class);
bind(StopwatchManager.class).to(DefaultStopwatchManager.class);
@@ -643,9 +652,7 @@ public class CoreModule extends AbstractPluginModule {
bind(WebSocketManager.class).to(DefaultWebSocketManager.class);
contributeFromPackage(EditSupport.class, EditSupportLocator.class);
-
- contribute(WebApplicationConfigurator.class, application -> application.mount(new BasePageMapper("/~test", TestPage.class)));
-
+
bind(CommitIndexedBroadcaster.class);
contributeFromPackage(DiffRenderer.class, DiffRenderer.class);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java
index 0319f6dac5..4e047750b7 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java
@@ -1,8 +1,20 @@
package io.onedev.server.buildspec.job.action.condition;
+import static io.onedev.server.buildspec.job.action.condition.ActionConditionLexer.Contains;
+import static io.onedev.server.buildspec.job.action.condition.ActionConditionLexer.Is;
+import static io.onedev.server.buildspec.job.action.condition.ActionConditionLexer.IsEmpty;
+import static io.onedev.server.buildspec.job.action.condition.ActionConditionLexer.IsNot;
+import static io.onedev.server.buildspec.job.action.condition.ActionConditionLexer.IsNotEmpty;
+import static io.onedev.server.model.Build.NAME_BRANCH;
+import static io.onedev.server.model.Build.NAME_LOG;
+import static io.onedev.server.model.Build.NAME_PROJECT;
+import static io.onedev.server.model.Build.NAME_PULL_REQUEST;
+import static io.onedev.server.model.Build.NAME_TAG;
+
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -32,14 +44,12 @@ import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.Ope
import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.OrCriteriaContext;
import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.ParensCriteriaContext;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.NotCriteria;
import io.onedev.server.util.criteria.OrCriteria;
-import static io.onedev.server.buildspec.job.action.condition.ActionConditionLexer.*;
-import static io.onedev.server.model.Build.*;
-
public class ActionCondition extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@@ -218,7 +228,7 @@ public class ActionCondition extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java
index 5d099b0d9c..8de19556bb 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.buildspec.job.action.condition;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class AlwaysCriteria extends Criteria<Build> {
@@ -13,7 +15,7 @@ public class AlwaysCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java
index fb7d2d46d6..72d3fec7f8 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java
@@ -1,16 +1,18 @@
package io.onedev.server.buildspec.job.action.condition;
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.PathMatcher;
+import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
+import static io.onedev.server.model.Build.NAME_BRANCH;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
-import static io.onedev.server.model.Build.NAME_BRANCH;
+import io.onedev.commons.utils.match.PathMatcher;
+import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class BranchCriteria extends Criteria<Build> {
@@ -26,7 +28,7 @@ public class BranchCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java
index 5decd44baa..e5853e1b97 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.buildspec.job.action.condition;
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
+import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
+import static io.onedev.server.model.Build.NAME_BRANCH;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
-import static io.onedev.server.model.Build.NAME_BRANCH;
+import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class BranchEmptyCriteria extends Criteria<Build> {
@@ -22,7 +24,7 @@ public class BranchEmptyCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java
index 9a700356e9..b3802f8b97 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.buildspec.job.action.condition;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class CancelledCriteria extends Criteria<Build> {
@@ -23,7 +25,7 @@ public class CancelledCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java
index 047362e181..acf979d351 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.buildspec.job.action.condition;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class FailedCriteria extends Criteria<Build> {
@@ -18,7 +20,7 @@ public class FailedCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java
index c8087ffe44..b6c424b154 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java
@@ -2,6 +2,7 @@ package io.onedev.server.buildspec.job.action.condition;
import java.util.regex.Pattern;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.OneDev;
import io.onedev.server.job.log.LogManager;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class LogCriteria extends Criteria<Build> {
@@ -23,7 +25,7 @@ public class LogCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java
index e399b45165..ab03397694 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.buildspec.job.action.condition;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class OnBranchCriteria extends Criteria<Build> {
@@ -19,7 +21,7 @@ public class OnBranchCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java
index 768f19ca96..17c920171b 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java
@@ -2,12 +2,14 @@ package io.onedev.server.buildspec.job.action.condition;
import java.util.List;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ParamCriteria extends Criteria<Build> {
@@ -27,7 +29,7 @@ public class ParamCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamEmptyCriteria.java
index 940db5fb93..5ff28c7590 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamEmptyCriteria.java
@@ -2,12 +2,14 @@ package io.onedev.server.buildspec.job.action.condition;
import java.util.List;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ParamEmptyCriteria extends Criteria<Build> {
@@ -24,7 +26,7 @@ public class ParamEmptyCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java
index 0b53d2d999..0cda40fe1b 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.buildspec.job.action.condition;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class PreviousIsCancelledCriteria extends Criteria<Build> {
@@ -13,7 +15,7 @@ public class PreviousIsCancelledCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java
index 939b612a32..77eb1f9701 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.buildspec.job.action.condition;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class PreviousIsFailedCriteria extends Criteria<Build> {
@@ -13,7 +15,7 @@ public class PreviousIsFailedCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java
index afea5231dd..8113443c43 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.buildspec.job.action.condition;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class PreviousIsSuccessfulCriteria extends Criteria<Build> {
@@ -13,7 +15,7 @@ public class PreviousIsSuccessfulCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java
index 4d389f6329..87c3d65794 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.buildspec.job.action.condition;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class PreviousIsTimedOutCriteria extends Criteria<Build> {
@@ -13,7 +15,7 @@ public class PreviousIsTimedOutCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ProjectCriteria.java
index 3fdcdcfd70..57db0af41e 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ProjectCriteria.java
@@ -1,16 +1,18 @@
package io.onedev.server.buildspec.job.action.condition;
-import io.onedev.commons.utils.match.WildcardUtils;
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
+import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
+import static io.onedev.server.model.Build.NAME_PROJECT;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
-import static io.onedev.server.model.Build.NAME_PROJECT;
+import io.onedev.commons.utils.match.WildcardUtils;
+import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class ProjectCriteria extends Criteria<Build> {
@@ -26,7 +28,7 @@ public class ProjectCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestEmptyCriteria.java
index 8517ed15ab..b8c2cc3aa3 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PullRequestEmptyCriteria.java
@@ -1,13 +1,15 @@
package io.onedev.server.buildspec.job.action.condition;
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class PullRequestEmptyCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@@ -19,7 +21,7 @@ public class PullRequestEmptyCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java
index 2d628358ed..2147aacf60 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.buildspec.job.action.condition;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class SuccessfulCriteria extends Criteria<Build> {
@@ -13,7 +15,7 @@ public class SuccessfulCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java
index fafe4deaee..5698beff64 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java
@@ -1,16 +1,18 @@
package io.onedev.server.buildspec.job.action.condition;
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.PathMatcher;
+import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
+import static io.onedev.server.model.Build.NAME_TAG;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
-import static io.onedev.server.model.Build.NAME_TAG;
+import io.onedev.commons.utils.match.PathMatcher;
+import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class TagCriteria extends Criteria<Build> {
@@ -26,7 +28,7 @@ public class TagCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagEmptyCriteria.java
index 0594e3af0c..3ad14edca1 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagEmptyCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.buildspec.job.action.condition;
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
+import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
+import static io.onedev.server.model.Build.NAME_TAG;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
-import static io.onedev.server.model.Build.NAME_TAG;
+import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class TagEmptyCriteria extends Criteria<Build> {
@@ -22,7 +24,7 @@ public class TagEmptyCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java
index b1c03650d0..5520c97a36 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.buildspec.job.action.condition;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class TimedOutCriteria extends Criteria<Build> {
@@ -23,7 +25,7 @@ public class TimedOutCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java
index 3598472e82..6dcba11319 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java
@@ -2,6 +2,7 @@ package io.onedev.server.buildspec.job.retrycondition;
import java.util.regex.Pattern;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.OneDev;
import io.onedev.server.job.log.LogManager;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class LogCriteria extends Criteria<RetryContext> {
@@ -23,7 +25,7 @@ public class LogCriteria extends Criteria<RetryContext> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<RetryContext, RetryContext> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<RetryContext, RetryContext> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java
index 78d48b24b3..83de013a4f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java
@@ -1,10 +1,12 @@
package io.onedev.server.buildspec.job.retrycondition;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class NeverCriteria extends Criteria<RetryContext> {
@@ -12,7 +14,7 @@ public class NeverCriteria extends Criteria<RetryContext> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<RetryContext, RetryContext> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<RetryContext, RetryContext> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java
index ba60464e3d..da0e2caaaa 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java
@@ -2,11 +2,13 @@ package io.onedev.server.buildspec.job.retrycondition;
import java.util.List;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ParamCriteria extends Criteria<RetryContext> {
@@ -26,7 +28,7 @@ public class ParamCriteria extends Criteria<RetryContext> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<RetryContext, RetryContext> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<RetryContext, RetryContext> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamEmptyCriteria.java
index 3895e8d88b..d5ecf2addf 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamEmptyCriteria.java
@@ -2,11 +2,13 @@ package io.onedev.server.buildspec.job.retrycondition;
import java.util.List;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ParamEmptyCriteria extends Criteria<RetryContext> {
@@ -23,7 +25,7 @@ public class ParamEmptyCriteria extends Criteria<RetryContext> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<RetryContext, RetryContext> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<RetryContext, RetryContext> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java
index 0397c3d6ca..51b75de33d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java
@@ -1,30 +1,47 @@
package io.onedev.server.buildspec.job.retrycondition;
+import static io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer.Contains;
+import static io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer.Is;
+import static io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer.IsEmpty;
+import static io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer.IsNot;
+import static io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer.IsNotEmpty;
+import static io.onedev.server.model.Build.NAME_LOG;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+
import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.codeassist.FenceAware;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.*;
+import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.AndCriteriaContext;
+import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.ConditionContext;
+import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.CriteriaContext;
+import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.FieldOperatorCriteriaContext;
+import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.NotCriteriaContext;
+import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.OrCriteriaContext;
+import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.ParensCriteriaContext;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.NotCriteria;
import io.onedev.server.util.criteria.OrCriteria;
-import org.antlr.v4.runtime.*;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
-import java.util.List;
-
-import static io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer.Contains;
-import static io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer.Is;
-import static io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer.IsEmpty;
-import static io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer.IsNot;
-import static io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer.IsNotEmpty;
-import static io.onedev.server.model.Build.NAME_LOG;
public class RetryCondition extends Criteria<RetryContext> {
@@ -41,7 +58,7 @@ public class RetryCondition extends Criteria<RetryContext> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<RetryContext, RetryContext> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<RetryContext, RetryContext> from, CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index c35af5f438..8686068361 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -7371,4 +7371,61 @@ public class DataMigrator {
}
}
+ private void migrate189(File dataDir, Stack<Integer> versions) {
+ Map<String, String> pullRequestIdToProjectId = new HashMap<>();
+ Map<String, String> codeCommentIdToProjectId = new HashMap<>();
+ for (File file : dataDir.listFiles()) {
+ if (file.getName().startsWith("PullRequests.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ pullRequestIdToProjectId.put(element.elementTextTrim("id"), element.elementTextTrim("targetProject"));
+ element.element("noSpaceTitle").detach();
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("CodeComments.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ codeCommentIdToProjectId.put(element.elementTextTrim("id"), element.elementTextTrim("project"));
+ }
+ } else if (file.getName().startsWith("Issues.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ element.element("noSpaceTitle").detach();
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+
+ VersionedXmlDoc pullRequestTouchsDom;
+ File pullRequestTouchsDomFile = new File(dataDir, "PullRequestTouchs.xml");
+ pullRequestTouchsDom = new VersionedXmlDoc();
+ Element listElement = pullRequestTouchsDom.addElement("list");
+
+ long touchId = 1;
+ for (var entry : pullRequestIdToProjectId.entrySet()) {
+ var pullRequestTouchElement = listElement.addElement("io.onedev.server.model.PullRequestTouch");
+ pullRequestTouchElement.addAttribute("revision", "0.0.0");
+ pullRequestTouchElement.addElement("project").setText(entry.getValue());
+ pullRequestTouchElement.addElement("requestId").setText(entry.getKey());
+ pullRequestTouchElement.addElement("id").setText(String.valueOf(touchId++));
+ }
+ pullRequestTouchsDom.writeToFile(pullRequestTouchsDomFile, true);
+
+ VersionedXmlDoc codeCommentTouchsDom;
+ File codeCommentTouchsDomFile = new File(dataDir, "CodeCommentTouchs.xml");
+ codeCommentTouchsDom = new VersionedXmlDoc();
+ listElement = codeCommentTouchsDom.addElement("list");
+
+ touchId = 1;
+ for (var entry : codeCommentIdToProjectId.entrySet()) {
+ var codeCommentTouchElement = listElement.addElement("io.onedev.server.model.CodeCommentTouch");
+ codeCommentTouchElement.addAttribute("revision", "0.0.0");
+ codeCommentTouchElement.addElement("project").setText(entry.getValue());
+ codeCommentTouchElement.addElement("commentId").setText(entry.getKey());
+ codeCommentTouchElement.addElement("id").setText(String.valueOf(touchId++));
+ }
+ codeCommentTouchsDom.writeToFile(codeCommentTouchsDomFile, true);
+
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentTouchManager.java
new file mode 100644
index 0000000000..ad11d030e2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentTouchManager.java
@@ -0,0 +1,15 @@
+package io.onedev.server.entitymanager;
+
+import java.util.List;
+
+import io.onedev.server.model.CodeCommentTouch;
+import io.onedev.server.model.Project;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface CodeCommentTouchManager extends EntityManager<CodeCommentTouch> {
+
+ void touch(Project project, Long commentId, boolean newComment);
+
+ List<CodeCommentTouch> queryTouchesAfter(Long projectId, Long afterTouchId, 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.java
index 864ee81c6d..6e286edc43 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
@@ -49,7 +49,8 @@ public interface IssueManager extends EntityManager<Issue> {
CriteriaQuery<?> query, CriteriaBuilder builder, From<Issue, Issue> issue);
List<javax.persistence.criteria.Order> buildOrders(List<EntitySort> sorts, CriteriaBuilder builder,
- From<Issue, Issue> issue);
+ From<Issue, Issue> issue,
+ List<javax.persistence.criteria.Order> preferOrders);
List<Issue> query(@Nullable ProjectScope projectScope, EntityQuery<Issue> issueQuery,
boolean loadExtraInfo, int firstResult, int maxResults);
@@ -58,8 +59,6 @@ public interface IssueManager extends EntityManager<Issue> {
IssueTimes queryTimes(ProjectScope projectScope, @Nullable Criteria<Issue> issueCriteria);
- List<Issue> query(@Nullable EntityQuery<Issue> scope, Project project, String fuzzyQuery, int count);
-
Collection<String> getUndefinedStates();
void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions);
@@ -95,4 +94,6 @@ public interface IssueManager extends EntityManager<Issue> {
Collection<Long> parseFixedIssueIds(Project project, String commitMessage);
+ List<Issue> loadIssues(List<Long> issueIds);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
index 45d4985962..4e5c25a71c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
@@ -1,5 +1,14 @@
package io.onedev.server.entitymanager;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.eclipse.jgit.lib.ObjectId;
+
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
@@ -9,13 +18,6 @@ import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectPullRequestStatusStat;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.util.StatsGroup;
-import org.apache.commons.lang3.tuple.Pair;
-import org.eclipse.jgit.lib.ObjectId;
-
-import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
public interface PullRequestManager extends EntityManager<PullRequest> {
@@ -59,12 +61,10 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
void checkAutoMerge(PullRequest request);
List<PullRequest> query(@Nullable Project targetProject, EntityQuery<PullRequest> requestQuery,
- boolean loadLabelsAndReviewsAndBuilds, int firstResult, int maxResults);
+ boolean loadExtraInfo, int firstResult, int maxResults);
int count(@Nullable Project targetProject, @Nullable Criteria<PullRequest> requestCriteria);
- List<PullRequest> query(Project targetProject, String fuzzyQuery, int count);
-
void delete(Collection<PullRequest> requests, Project project);
List<ProjectPullRequestStatusStat> queryStatusStats(Collection<Project> projects);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestTouchManager.java
new file mode 100644
index 0000000000..56b0d2a9d8
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestTouchManager.java
@@ -0,0 +1,15 @@
+package io.onedev.server.entitymanager;
+
+import java.util.List;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequestTouch;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface PullRequestTouchManager extends EntityManager<PullRequestTouch> {
+
+ void touch(Project project, Long requestId, boolean newRequest);
+
+ List<PullRequestTouch> queryTouchesAfter(Long projectId, Long afterTouchId, int count);
+
+}
diff --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.java
index 9be39c3566..d0bc0eb2de 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
@@ -301,7 +301,7 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
query.select(root);
if (agentQuery.getCriteria() != null)
- query.where(agentQuery.getCriteria().getPredicate(query, root, builder));
+ query.where(agentQuery.getCriteria().getPredicate(null, query, root, builder));
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
for (EntitySort sort: agentQuery.getSorts()) {
@@ -337,7 +337,7 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age
Root<Agent> root = criteriaQuery.from(Agent.class);
if (agentCriteria != null)
- criteriaQuery.where(agentCriteria.getPredicate(criteriaQuery, root, builder));
+ criteriaQuery.where(agentCriteria.getPredicate(null, 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.java
index a30c4522d2..a07d1e1953 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
@@ -1,22 +1,98 @@
package io.onedev.server.entitymanager.impl;
+import static com.google.common.collect.Lists.newArrayList;
+import static edu.emory.mathcs.backport.java.util.Collections.sort;
+import static io.onedev.commons.utils.LockUtils.write;
+import static io.onedev.server.model.Build.ARTIFACTS_DIR;
+import static io.onedev.server.model.Build.LOG_FILE;
+import static io.onedev.server.model.Build.PROP_FINISH_TIME_GROUPS;
+import static io.onedev.server.model.Build.PROP_PENDING_DURATION;
+import static io.onedev.server.model.Build.PROP_RUNNING_DURATION;
+import static io.onedev.server.model.Build.PROP_STATUS;
+import static io.onedev.server.model.Build.SORT_FIELDS;
+import static io.onedev.server.model.Build.getArtifactsLockName;
+import static io.onedev.server.model.Build.getLogLockName;
+import static io.onedev.server.model.Build.getProjectRelativeDirPath;
+import static io.onedev.server.model.Build.Status.SUCCESSFUL;
+import static io.onedev.server.model.Project.BUILDS_DIR;
+import static io.onedev.server.model.Project.SHARE_TEST_DIR;
+import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
+import static io.onedev.server.util.DirectoryVersionUtils.isVersionFile;
+import static java.lang.Long.valueOf;
+
+import java.io.File;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Selection;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.eclipse.jgit.lib.ObjectId;
+import org.hibernate.Session;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.MatchMode;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.ScheduleBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.common.base.Preconditions;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.map.IMap;
+
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
import io.onedev.server.OneDev;
import io.onedev.server.StorageManager;
import io.onedev.server.cluster.ClusterManager;
-import io.onedev.server.entitymanager.*;
+import io.onedev.server.entitymanager.BuildDependenceManager;
+import io.onedev.server.entitymanager.BuildLabelManager;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.BuildParamManager;
+import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.event.Listen;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarting;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.git.service.GitService;
-import io.onedev.server.model.*;
+import io.onedev.server.model.Agent;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Build.Status;
+import io.onedev.server.model.BuildDependence;
+import io.onedev.server.model.BuildParam;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.build.BuildPreservation;
import io.onedev.server.persistence.SequenceGenerator;
import io.onedev.server.persistence.SessionManager;
@@ -29,7 +105,6 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.replica.BuildStorageSyncer;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
-import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.taskschedule.SchedulableTask;
@@ -42,43 +117,6 @@ import io.onedev.server.util.artifact.FileInfo;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.facade.BuildFacade;
import io.onedev.server.web.util.StatsGroup;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.eclipse.jgit.lib.ObjectId;
-import org.hibernate.Session;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.query.Query;
-import org.quartz.CronScheduleBuilder;
-import org.quartz.ScheduleBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.persistence.criteria.*;
-import javax.ws.rs.core.MediaType;
-import java.io.File;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.nio.file.Files;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-import static com.google.common.collect.Lists.newArrayList;
-import static edu.emory.mathcs.backport.java.util.Collections.sort;
-import static io.onedev.commons.utils.LockUtils.write;
-import static io.onedev.server.model.Build.*;
-import static io.onedev.server.model.Build.Status.SUCCESSFUL;
-import static io.onedev.server.model.Project.BUILDS_DIR;
-import static io.onedev.server.model.Project.SHARE_TEST_DIR;
-import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
-import static io.onedev.server.util.DirectoryVersionUtils.isVersionFile;
-import static java.lang.Long.valueOf;
@Singleton
public class DefaultBuildManager extends BaseEntityManager<Build> implements BuildManager, SchedulableTask, Serializable {
@@ -546,7 +584,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
CriteriaQuery<?> query, From<Build, Build> root, CriteriaBuilder builder) {
Collection<Predicate> predicates = getPredicates(project, root, builder);
if (criteria != null)
- predicates.add(criteria.getPredicate(query, root, builder));
+ predicates.add(criteria.getPredicate(null, query, root, builder));
return predicates.toArray(new Predicate[0]);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
index ddb980552f..2f359ee1c6 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
@@ -1,14 +1,52 @@
package io.onedev.server.entitymanager.impl;
+import static io.onedev.server.model.CodeComment.SORT_FIELDS;
+import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.apache.commons.lang3.time.DateUtils;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.hibernate.Session;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
+
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.event.Listen;
import io.onedev.server.event.ListenerRegistry;
-import io.onedev.server.event.project.codecomment.*;
+import io.onedev.server.event.project.codecomment.CodeCommentCreated;
+import io.onedev.server.event.project.codecomment.CodeCommentDeleted;
+import io.onedev.server.event.project.codecomment.CodeCommentEdited;
+import io.onedev.server.event.project.codecomment.CodeCommentEvent;
+import io.onedev.server.event.project.codecomment.CodeCommentsDeleted;
import io.onedev.server.event.project.pullrequest.PullRequestCodeCommentCreated;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.command.RevListOptions;
@@ -28,29 +66,11 @@ import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.xodus.CommitInfoManager;
-import org.apache.commons.lang3.time.DateUtils;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.PersonIdent;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.hibernate.Session;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.query.Query;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.persistence.criteria.*;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static io.onedev.server.model.CodeComment.SORT_FIELDS;
-import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
@Singleton
public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> implements CodeCommentManager {
@@ -240,8 +260,10 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> im
predicates.add(builder.equal(CodeCommentQuery.getPath(root, CodeComment.PROP_COMPARE_CONTEXT + "." + CompareContext.PROP_PULL_REQUEST), request));
else
predicates.add(builder.equal(root.get(CodeComment.PROP_PROJECT), project));
- if (criteria != null)
- predicates.add(criteria.getPredicate(query, root, builder));
+ if (criteria != null) {
+ var projectScope = new ProjectScope(project, false, false);
+ predicates.add(criteria.getPredicate(projectScope, query, root, builder));
+ }
return predicates.toArray(new Predicate[0]);
}
@@ -254,6 +276,8 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> im
query.where(getPredicates(project, commentQuery.getCriteria(), request, query, root, builder));
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
+ if (commentQuery.getCriteria() != null)
+ orders.addAll(commentQuery.getCriteria().getPreferOrders(builder, root));
for (EntitySort sort: commentQuery.getSorts()) {
if (sort.getDirection() == ASCENDING)
orders.add(builder.asc(CodeCommentQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentTouchManager.java
new file mode 100644
index 0000000000..762b465a6d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentTouchManager.java
@@ -0,0 +1,124 @@
+package io.onedev.server.entitymanager.impl;
+
+import static io.onedev.server.model.CodeCommentTouch.PROP_COMMENT_ID;
+import static java.lang.String.format;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.server.entitymanager.CodeCommentTouchManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.event.Listen;
+import io.onedev.server.event.ListenerRegistry;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.project.codecomment.CodeCommentCreated;
+import io.onedev.server.event.project.codecomment.CodeCommentEdited;
+import io.onedev.server.event.project.codecomment.CodeCommentReplyCreated;
+import io.onedev.server.event.project.codecomment.CodeCommentReplyDeleted;
+import io.onedev.server.event.project.codecomment.CodeCommentReplyEdited;
+import io.onedev.server.event.project.codecomment.CodeCommentTouched;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentTouch;
+import io.onedev.server.model.Project;
+import io.onedev.server.persistence.TransactionManager;
+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;
+
+@Singleton
+public class DefaultCodeCommentTouchManager extends BaseEntityManager<CodeCommentTouch>
+ implements CodeCommentTouchManager {
+
+ private final ProjectManager projectManager;
+
+ private final TransactionManager transactionManager;
+
+ private final ListenerRegistry listenerRegistry;
+
+ @Inject
+ public DefaultCodeCommentTouchManager(Dao dao, ProjectManager projectManager,
+ TransactionManager transactionManager, ListenerRegistry listenerRegistry) {
+ super(dao);
+ this.projectManager = projectManager;
+ this.transactionManager = transactionManager;
+ this.listenerRegistry = listenerRegistry;
+ }
+
+ @Transactional
+ @Override
+ public void touch(Project project, Long commentId, boolean newComment) {
+ var projectId = project.getId();
+ transactionManager.runAfterCommit(() -> transactionManager.runAsync(() -> {
+ var innerProject = projectManager.load(projectId);
+ if (!newComment) {
+ var query = getSession().createQuery(format("delete from CodeCommentTouch where project=:project and %s=:%s", PROP_COMMENT_ID, PROP_COMMENT_ID));
+ query.setParameter("project", innerProject);
+ query.setParameter(PROP_COMMENT_ID, commentId);
+ query.executeUpdate();
+ }
+
+ var touch = new CodeCommentTouch();
+ touch.setProject(innerProject);
+ touch.setCommentId(commentId);
+ dao.persist(touch);
+
+ listenerRegistry.post(new CodeCommentTouched(innerProject, commentId));
+ }));
+ }
+
+ @Sessional
+ @Override
+ public List<CodeCommentTouch> queryTouchesAfter(Long projectId, Long afterTouchId, int count) {
+ EntityCriteria<CodeCommentTouch> criteria = EntityCriteria.of(CodeCommentTouch.class);
+ criteria.add(Restrictions.eq("project.id", projectId));
+ criteria.add(Restrictions.gt(AbstractEntity.PROP_ID, afterTouchId));
+ return dao.query(criteria, 0, count);
+ }
+
+ @Transactional
+ @Listen
+ public void on(CodeCommentCreated event) {
+ touch(event.getProject(), event.getComment().getId(), true);
+ }
+
+ @Transactional
+ @Listen
+ public void on(CodeCommentEdited event) {
+ touch(event.getProject(), event.getComment().getId(), false);
+ }
+
+ @Transactional
+ @Listen
+ public void on(CodeCommentReplyCreated event) {
+ touch(event.getProject(), event.getComment().getId(), false);
+ }
+
+ @Transactional
+ @Listen
+ public void on(CodeCommentReplyEdited event) {
+ touch(event.getProject(), event.getComment().getId(), false);
+ }
+
+ @Transactional
+ @Listen
+ public void on(CodeCommentReplyDeleted event) {
+ touch(event.getProject(), event.getComment().getId(), false);
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityRemoved event) {
+ if (event.getEntity() instanceof CodeComment) {
+ CodeComment comment = (CodeComment) event.getEntity();
+ touch(comment.getProject(), comment.getId(), false);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 8b7cb55970..c869781d26 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
@@ -8,7 +8,6 @@ import static java.util.stream.Collectors.toSet;
import java.io.ObjectStreamException;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
@@ -270,8 +269,9 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
@Override
public List<javax.persistence.criteria.Order> buildOrders(List<EntitySort> sorts, CriteriaBuilder builder,
- From<Issue, Issue> issue) {
- List<javax.persistence.criteria.Order> orders = new ArrayList<>();
+ From<Issue, Issue> issue,
+ List<javax.persistence.criteria.Order> preferOrders) {
+ List<javax.persistence.criteria.Order> orders = new ArrayList<>(preferOrders);
for (EntitySort sort: sorts) {
if (Issue.SORT_FIELDS.containsKey(sort.getField())) {
if (sort.getDirection() == Direction.ASCENDING)
@@ -287,7 +287,6 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
orders.add(builder.desc(join.get(IssueField.PROP_ORDINAL)));
}
}
-
if (orders.isEmpty())
orders.add(builder.desc(IssueQuery.getPath(issue, Issue.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE)));
@@ -309,7 +308,11 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
Root<Issue> root = criteriaQuery.from(Issue.class);
criteriaQuery.where(buildPredicates(projectScope, issueQuery.getCriteria(), criteriaQuery, builder, root));
- criteriaQuery.orderBy(buildOrders(issueQuery.getSorts(), builder, root));
+ var criteria = issueQuery.getCriteria();
+ List<javax.persistence.criteria.Order> preferOrders = new ArrayList<>();
+ if (criteria != null)
+ preferOrders.addAll(criteria.getPreferOrders(builder, root));
+ criteriaQuery.orderBy(buildOrders(issueQuery.getSorts(), builder, root, preferOrders));
Query<Issue> query = getSession().createQuery(criteriaQuery);
query.setFirstResult(firstResult);
@@ -399,7 +402,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
}
}
if (issueCriteria != null)
- predicates.add(issueCriteria.getPredicate(query, issue, builder));
+ predicates.add(issueCriteria.getPredicate(projectScope, query, issue, builder));
return predicates.toArray(new Predicate[predicates.size()]);
}
@@ -867,53 +870,6 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
return resolutions;
}
- @Sessional
- @Override
- public List<Issue> query(EntityQuery<Issue> scope, Project project, String fuzzyQuery, int count) {
- CriteriaBuilder builder = getSession().getCriteriaBuilder();
- CriteriaQuery<Issue> criteriaQuery = builder.createQuery(Issue.class);
- Root<Issue> root = criteriaQuery.from(Issue.class);
-
- List<Predicate> predicates = new ArrayList<>();
-
- if (scope != null)
- predicates.addAll(Arrays.asList(buildPredicates(null, scope.getCriteria(), criteriaQuery, builder, root)));
-
- List<Predicate> projectPredicates = new ArrayList<>();
- if (SecurityUtils.canAccessConfidentialIssues(project)) {
- projectPredicates.add(builder.equal(root.get(Issue.PROP_PROJECT), project));
- } else {
- projectPredicates.add(buildNonConfidentialPredicate(builder, root, project));
- projectPredicates.add(buildAuthorizationPredicate(criteriaQuery, builder, root, project));
- }
- predicates.add(builder.or(projectPredicates.toArray(new Predicate[0])));
-
- if (fuzzyQuery.length() != 0) {
- try {
- long buildNumber = Long.parseLong(fuzzyQuery);
- predicates.add(builder.equal(root.get(Issue.PROP_NUMBER), buildNumber));
- } catch (NumberFormatException e) {
- predicates.add(builder.or(
- builder.like(builder.lower(root.get(Issue.PROP_TITLE)), "%" + fuzzyQuery.toLowerCase() + "%"),
- builder.like(builder.lower(root.get(Issue.PROP_NO_SPACE_TITLE)), "%" + fuzzyQuery.toLowerCase() + "%")));
- }
- }
-
- criteriaQuery.where(predicates.toArray(new Predicate[0]));
-
- if (scope != null && !scope.getSorts().isEmpty()) {
- criteriaQuery.orderBy(buildOrders(scope.getSorts(), builder, root));
- } else {
- criteriaQuery.orderBy(
- builder.desc(root.get(Issue.PROP_PROJECT)),
- builder.desc(root.get(Issue.PROP_NUMBER)));
- }
-
- Query<Issue> query = getSession().createQuery(criteriaQuery);
- query.setFirstResult(0);
- query.setMaxResults(count);
- return query.getResultList();
- }
@Transactional
@Override
@@ -1286,5 +1242,25 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
}
return issues;
}
+
+ @Sessional
+ @Override
+ public List<Issue> loadIssues(List<Long> issueIds) {
+ EntityCriteria<Issue> criteria = newCriteria();
+ criteria.add(Restrictions.in("id", issueIds));
+ var issues = query(criteria);
+
+ Map<Long, Issue> issueMap = new HashMap<>();
+ for (Issue issue: issues)
+ issueMap.put(issue.getId(), issue);
+
+ List<Issue> orderedIssues = new ArrayList<>();
+ for (Long issueId: issueIds) {
+ Issue issue = issueMap.get(issueId);
+ if (issue != null)
+ orderedIssues.add(issue);
+ }
+ return orderedIssues;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWorkManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWorkManager.java
index 4953cabd5f..b66de009d7 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWorkManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWorkManager.java
@@ -71,7 +71,10 @@ public class DefaultIssueWorkManager extends BaseEntityManager<IssueWork> implem
predicates.add(builder.le(root.get(PROP_DAY), toDay));
criteriaQuery.where(predicates.toArray(new Predicate[0]));
- criteriaQuery.orderBy(issueManager.buildOrders(issueQuery.getSorts(), builder, issue));
+ List<javax.persistence.criteria.Order> preferOrders = new ArrayList<>();
+ if (issueQuery.getCriteria() != null)
+ preferOrders.addAll(issueQuery.getCriteria().getPreferOrders(builder, issue));
+ criteriaQuery.orderBy(issueManager.buildOrders(issueQuery.getSorts(), builder, issue, preferOrders));
Query<IssueWork> query = getSession().createQuery(criteriaQuery);
query.setFirstResult(0);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java
index ab437f623a..24c45e43ae 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java
@@ -1,12 +1,58 @@
package io.onedev.server.entitymanager.impl;
+import static io.onedev.server.model.AbstractEntity.PROP_ID;
+import static io.onedev.server.model.Pack.PROP_BUILD;
+import static io.onedev.server.model.Pack.PROP_NAME;
+import static io.onedev.server.model.Pack.PROP_PRERELEASE;
+import static io.onedev.server.model.Pack.PROP_PROJECT;
+import static io.onedev.server.model.Pack.PROP_TYPE;
+import static io.onedev.server.model.Pack.PROP_VERSION;
+import static io.onedev.server.model.Pack.SORT_FIELDS;
+import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
+import static java.lang.Math.min;
+
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
+
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
+
import io.onedev.commons.loader.ManagedSerializedForm;
-import io.onedev.server.entitymanager.*;
+import io.onedev.server.entitymanager.PackBlobAuthorizationManager;
+import io.onedev.server.entitymanager.PackBlobManager;
+import io.onedev.server.entitymanager.PackBlobReferenceManager;
+import io.onedev.server.entitymanager.PackLabelManager;
+import io.onedev.server.entitymanager.PackManager;
+import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.pack.PackPublished;
-import io.onedev.server.model.*;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Pack;
+import io.onedev.server.model.PackBlob;
+import io.onedev.server.model.PackBlobReference;
+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;
@@ -18,22 +64,6 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ReadPack;
import io.onedev.server.util.ProjectPackTypeStat;
import io.onedev.server.util.criteria.Criteria;
-import org.hibernate.Session;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.query.Query;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.persistence.criteria.*;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static io.onedev.server.model.Pack.*;
-import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
-import static java.lang.Math.min;
@Singleton
public class DefaultPackManager extends BaseEntityManager<Pack>
@@ -207,8 +237,8 @@ public class DefaultPackManager extends BaseEntityManager<Pack>
private Predicate[] getPredicates(@Nullable Project project, @Nullable Criteria<Pack> criteria,
CriteriaQuery<?> query, From<Pack, Pack> root, CriteriaBuilder builder) {
Collection<Predicate> predicates = getPredicates(project, root, builder);
- if (criteria != null)
- predicates.add(criteria.getPredicate(query, root, builder));
+ if (criteria != null)
+ predicates.add(criteria.getPredicate(null, query, root, builder));
return predicates.toArray(new Predicate[0]);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index fb99f02062..48c23d7f90 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
@@ -975,7 +975,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
}
}
if (criteria != null)
- predicates.add(criteria.getPredicate(query, from, builder));
+ predicates.add(criteria.getPredicate(null, query, from, builder));
return predicates.toArray(new Predicate[0]);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 1fb999d71f..0011ab431b 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
@@ -1,8 +1,60 @@
package io.onedev.server.entitymanager.impl;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.Lists.newArrayList;
+import static io.onedev.server.model.PullRequest.PROP_CLOSE_TIME_GROUPS;
+import static io.onedev.server.model.PullRequest.PROP_DURATION;
+import static io.onedev.server.model.PullRequest.PROP_STATUS;
+import static io.onedev.server.model.PullRequest.PROP_SUBMIT_TIME_GROUPS;
+import static io.onedev.server.model.PullRequest.getSerialLockName;
+import static io.onedev.server.model.PullRequest.Status.MERGED;
+import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;
+import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;
+import static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;
+import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;
+import static java.util.Arrays.asList;
+
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.hibernate.Session;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.LockUtils;
@@ -10,23 +62,62 @@ import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.cluster.ClusterRunnable;
import io.onedev.server.cluster.ClusterTask;
-import io.onedev.server.entitymanager.*;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.PendingSuggestionApplyManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.PullRequestChangeManager;
+import io.onedev.server.entitymanager.PullRequestLabelManager;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.PullRequestReviewManager;
+import io.onedev.server.entitymanager.PullRequestUpdateManager;
+import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.Listen;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.project.RefUpdated;
import io.onedev.server.event.project.build.BuildEvent;
-import io.onedev.server.event.project.pullrequest.*;
+import io.onedev.server.event.project.pullrequest.PullRequestBuildCommitUpdated;
+import io.onedev.server.event.project.pullrequest.PullRequestBuildEvent;
+import io.onedev.server.event.project.pullrequest.PullRequestChanged;
+import io.onedev.server.event.project.pullrequest.PullRequestCheckFailed;
+import io.onedev.server.event.project.pullrequest.PullRequestCodeCommentEvent;
+import io.onedev.server.event.project.pullrequest.PullRequestDeleted;
+import io.onedev.server.event.project.pullrequest.PullRequestEvent;
+import io.onedev.server.event.project.pullrequest.PullRequestMergePreviewUpdated;
+import io.onedev.server.event.project.pullrequest.PullRequestOpened;
+import io.onedev.server.event.project.pullrequest.PullRequestReviewerRemoved;
+import io.onedev.server.event.project.pullrequest.PullRequestUpdated;
+import io.onedev.server.event.project.pullrequest.PullRequestsDeleted;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.service.GitService;
-import io.onedev.server.model.*;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentReply;
+import io.onedev.server.model.CodeCommentStatusChange;
+import io.onedev.server.model.Group;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequest.Status;
+import io.onedev.server.model.PullRequestAssignment;
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.PullRequestUpdate;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.code.BranchProtection;
import io.onedev.server.model.support.code.FileProtection;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
-import io.onedev.server.model.support.pullrequest.changedata.*;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchDeleteData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchRestoreData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestTargetBranchChangeData;
import io.onedev.server.persistence.SequenceGenerator;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
@@ -42,41 +133,13 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectPullRequestStatusStat;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.facade.EmailAddressFacade;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
import io.onedev.server.web.util.StatsGroup;
import io.onedev.server.xodus.CommitInfoManager;
import io.onedev.server.xodus.PullRequestInfoManager;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.PersonIdent;
-import org.hibernate.Session;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.query.Query;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.persistence.criteria.*;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.Lists.newArrayList;
-import static io.onedev.server.model.PullRequest.*;
-import static io.onedev.server.model.PullRequest.Status.MERGED;
-import static io.onedev.server.model.support.pullrequest.MergeStrategy.*;
-import static java.util.Arrays.asList;
@Singleton
public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
@@ -823,8 +886,10 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
}
}
- if (criteria != null)
- predicates.add(criteria.getPredicate(query, from, builder));
+ if (criteria != null) {
+ var projectScope = targetProject!=null?new ProjectScope(targetProject, false, false):null;
+ predicates.add(criteria.getPredicate(projectScope, query, from, builder));
+ }
return predicates.toArray(new Predicate[0]);
}
@@ -837,6 +902,8 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
query.where(getPredicates(targetProject, requestQuery.getCriteria(), query, root, builder));
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
+ if (requestQuery.getCriteria() != null)
+ orders.addAll(requestQuery.getCriteria().getPreferOrders(builder, root));
for (EntitySort sort: requestQuery.getSorts()) {
if (sort.getDirection() == Direction.ASCENDING) {
orders.add(builder.asc(PullRequestQuery.getPath(
@@ -858,14 +925,14 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
@Sessional
@Override
public List<PullRequest> query(@Nullable Project targetProject, EntityQuery<PullRequest> requestQuery,
- boolean loadLabelsAndReviewsAndBuilds, int firstResult, int maxResults) {
+ boolean loadExtraInfo, int firstResult, int maxResults) {
CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), targetProject, requestQuery);
Query<PullRequest> query = getSession().createQuery(criteriaQuery);
query.setFirstResult(firstResult);
query.setMaxResults(maxResults);
List<PullRequest> requests = query.getResultList();
- if (!requests.isEmpty() && loadLabelsAndReviewsAndBuilds) {
+ if (!requests.isEmpty() && loadExtraInfo) {
reviewManager.populateReviews(requests);
buildManager.populateBuilds(requests);
labelManager.populateLabels(requests);
@@ -913,32 +980,6 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
return find(criteria);
}
- @Sessional
- @Override
- public List<PullRequest> query(Project project, String fuzzyQuery, int count) {
- List<PullRequest> requests = new ArrayList<>();
-
- EntityCriteria<PullRequest> criteria = newCriteria();
- criteria.add(Restrictions.eq(PullRequest.PROP_TARGET_PROJECT, project));
-
- if (fuzzyQuery.length() != 0) {
- try {
- long buildNumber = Long.parseLong(fuzzyQuery);
- criteria.add(Restrictions.eq(PullRequest.PROP_NUMBER, buildNumber));
- } catch (NumberFormatException e) {
- criteria.add(Restrictions.or(
- Restrictions.ilike(PullRequest.PROP_TITLE, fuzzyQuery, MatchMode.ANYWHERE),
- Restrictions.ilike(PullRequest.PROP_NO_SPACE_TITLE, fuzzyQuery, MatchMode.ANYWHERE)));
- }
- }
-
- criteria.addOrder(Order.desc(PullRequest.PROP_TARGET_PROJECT));
- criteria.addOrder(Order.desc(PullRequest.PROP_NUMBER));
- requests.addAll(query(criteria, 0, count));
-
- return requests;
- }
-
@Transactional
@Override
public void delete(Collection<PullRequest> requests, Project project) {
@@ -1050,20 +1091,12 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
Restrictions.eq(PullRequest.PROP_TARGET_BRANCH, target.getBranch()));
}
- private Criterion ofTargetProject(Project target) {
- return Restrictions.eq(PullRequest.PROP_TARGET_PROJECT, target);
- }
-
private Criterion ofSource(ProjectAndBranch source) {
return Restrictions.and(
Restrictions.eq(PullRequest.PROP_SOURCE_PROJECT, source.getProject()),
Restrictions.eq(PullRequest.PROP_SOURCE_BRANCH, source.getBranch()));
}
- private Criterion ofSourceProject(Project source) {
- return Restrictions.eq(PullRequest.PROP_SOURCE_PROJECT, source);
- }
-
@Sessional
@Override
public ObjectId getComparisonBase(PullRequest request, ObjectId oldCommitId, ObjectId newCommitId) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestTouchManager.java
new file mode 100644
index 0000000000..31de71a65c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestTouchManager.java
@@ -0,0 +1,121 @@
+package io.onedev.server.entitymanager.impl;
+
+import static io.onedev.server.model.PullRequestTouch.PROP_REQUEST_ID;
+import static java.lang.String.format;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.PullRequestTouchManager;
+import io.onedev.server.event.Listen;
+import io.onedev.server.event.ListenerRegistry;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.project.pullrequest.PullRequestChanged;
+import io.onedev.server.event.project.pullrequest.PullRequestCommentCreated;
+import io.onedev.server.event.project.pullrequest.PullRequestCommentEdited;
+import io.onedev.server.event.project.pullrequest.PullRequestOpened;
+import io.onedev.server.event.project.pullrequest.PullRequestTouched;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.model.PullRequestTouch;
+import io.onedev.server.persistence.TransactionManager;
+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;
+
+@Singleton
+public class DefaultPullRequestTouchManager extends BaseEntityManager<PullRequestTouch>
+ implements PullRequestTouchManager {
+
+ private final ProjectManager projectManager;
+
+ private final TransactionManager transactionManager;
+
+ private final ListenerRegistry listenerRegistry;
+
+ @Inject
+ public DefaultPullRequestTouchManager(Dao dao, ProjectManager projectManager,
+ TransactionManager transactionManager, ListenerRegistry listenerRegistry) {
+ super(dao);
+ this.projectManager = projectManager;
+ this.transactionManager = transactionManager;
+ this.listenerRegistry = listenerRegistry;
+ }
+
+ @Transactional
+ @Override
+ public void touch(Project project, Long requestId, boolean newRequest) {
+ var projectId = project.getId();
+ transactionManager.runAfterCommit(() -> transactionManager.runAsync(() -> {
+ var innerProject = projectManager.load(projectId);
+ if (!newRequest) {
+ var query = getSession().createQuery(format("delete from PullRequestTouch where project=:project and %s=:%s", PROP_REQUEST_ID, PROP_REQUEST_ID));
+ query.setParameter("project", innerProject);
+ query.setParameter(PROP_REQUEST_ID, requestId);
+ query.executeUpdate();
+ }
+
+ var touch = new PullRequestTouch();
+ touch.setProject(innerProject);
+ touch.setRequestId(requestId);
+ dao.persist(touch);
+
+ listenerRegistry.post(new PullRequestTouched(innerProject, requestId));
+ }));
+ }
+
+ @Sessional
+ @Override
+ public List<PullRequestTouch> queryTouchesAfter(Long projectId, Long afterTouchId, int count) {
+ EntityCriteria<PullRequestTouch> criteria = EntityCriteria.of(PullRequestTouch.class);
+ criteria.add(Restrictions.eq("project.id", projectId));
+ criteria.add(Restrictions.gt(AbstractEntity.PROP_ID, afterTouchId));
+ return dao.query(criteria, 0, count);
+ }
+
+ @Transactional
+ @Listen
+ public void on(PullRequestOpened event) {
+ touch(event.getProject(), event.getRequest().getId(), true);
+ }
+
+ @Transactional
+ @Listen
+ public void on(PullRequestCommentCreated event) {
+ touch(event.getProject(), event.getRequest().getId(), false);
+ }
+
+ @Transactional
+ @Listen
+ public void on(PullRequestCommentEdited event) {
+ touch(event.getProject(), event.getRequest().getId(), false);
+ }
+
+ @Transactional
+ @Listen
+ public void on(PullRequestChanged event) {
+ touch(event.getProject(), event.getRequest().getId(), false);
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityRemoved event) {
+ if (event.getEntity() instanceof PullRequest) {
+ PullRequest request = (PullRequest) event.getEntity();
+ touch(request.getProject(), request.getId(), false);
+ } else if (event.getEntity() instanceof PullRequestComment) {
+ PullRequestComment comment = (PullRequestComment) event.getEntity();
+ touch(comment.getRequest().getProject(), comment.getRequest().getId(), false);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/event/project/codecomment/CodeCommentTouched.java b/server-core/src/main/java/io/onedev/server/event/project/codecomment/CodeCommentTouched.java
new file mode 100644
index 0000000000..f173e1c3b9
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/project/codecomment/CodeCommentTouched.java
@@ -0,0 +1,29 @@
+package io.onedev.server.event.project.codecomment;
+
+import java.util.Date;
+
+import io.onedev.server.event.project.ProjectEvent;
+import io.onedev.server.model.Project;
+import io.onedev.server.security.SecurityUtils;
+
+public class CodeCommentTouched extends ProjectEvent {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long commentId;
+
+ public CodeCommentTouched(Project project, Long commentId) {
+ super(SecurityUtils.getUser(), new Date(), project);
+ this.commentId = commentId;
+ }
+
+ public Long getCommentId() {
+ return commentId;
+ }
+
+ @Override
+ public String getActivity() {
+ return "touched";
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestTouched.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestTouched.java
new file mode 100644
index 0000000000..3e3cbb4a42
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestTouched.java
@@ -0,0 +1,29 @@
+package io.onedev.server.event.project.pullrequest;
+
+import java.util.Date;
+
+import io.onedev.server.event.project.ProjectEvent;
+import io.onedev.server.model.Project;
+import io.onedev.server.security.SecurityUtils;
+
+public class PullRequestTouched extends ProjectEvent {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long requestId;
+
+ public PullRequestTouched(Project project, Long requestId) {
+ super(SecurityUtils.getUser(), new Date(), project);
+ this.requestId = requestId;
+ }
+
+ public Long getRequestId() {
+ return requestId;
+ }
+
+ @Override
+ public String getActivity() {
+ return "touched";
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/job/match/GroupCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/GroupCriteria.java
index 86c5b6d5ca..77c605365c 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/GroupCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/GroupCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.job.match;
-import io.onedev.server.model.Group;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.Criteria;
+import static io.onedev.server.job.match.JobMatchLexer.SubmittedByGroup;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import static io.onedev.server.job.match.JobMatchLexer.SubmittedByGroup;
+import io.onedev.server.model.Group;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class GroupCriteria extends Criteria<JobMatchContext> {
@@ -44,7 +46,7 @@ public class GroupCriteria extends Criteria<JobMatchContext> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java
index d6d756b339..97c285ba6c 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.job.match;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.match.WildcardUtils;
+import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class JobCriteria extends Criteria<JobMatchContext> {
private static final long serialVersionUID = 1L;
@@ -36,7 +38,7 @@ public class JobCriteria extends Criteria<JobMatchContext> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
index c6c4396e71..d76aa01011 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
@@ -1,5 +1,28 @@
package io.onedev.server.job.match;
+import static io.onedev.commons.codeassist.AntlrUtils.getLexerRuleName;
+import static io.onedev.server.job.match.JobMatchParser.IsNot;
+import static io.onedev.server.job.match.JobMatchParser.OnBranch;
+import static io.onedev.server.job.match.JobMatchParser.SubmittedByGroup;
+import static io.onedev.server.job.match.JobMatchParser.SubmittedByUser;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+
import io.onedev.commons.codeassist.FenceAware;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
@@ -7,21 +30,11 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.NotCriteria;
import io.onedev.server.util.criteria.OrCriteria;
-import org.antlr.v4.runtime.*;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
-import java.util.List;
-
-import static io.onedev.commons.codeassist.AntlrUtils.getLexerRuleName;
-import static io.onedev.server.job.match.JobMatchParser.*;
public class JobMatch extends Criteria<JobMatchContext> {
@@ -155,7 +168,7 @@ public class JobMatch extends Criteria<JobMatchContext> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java
index cbab29d4db..af868bd2e5 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java
@@ -1,13 +1,15 @@
package io.onedev.server.job.match;
-import io.onedev.server.util.criteria.Criteria;
+import static io.onedev.commons.utils.match.WildcardUtils.matchPath;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import static io.onedev.commons.utils.match.WildcardUtils.matchPath;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class OnBranchCriteria extends Criteria<JobMatchContext> {
@@ -35,7 +37,7 @@ public class OnBranchCriteria extends Criteria<JobMatchContext> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
index daea94fb8a..ed518dff20 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.job.match;
-import io.onedev.commons.utils.PathUtils;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
+import static io.onedev.server.model.Build.NAME_PROJECT;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import static io.onedev.server.model.Build.NAME_PROJECT;
+import io.onedev.commons.utils.PathUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class ProjectCriteria extends Criteria<JobMatchContext> {
@@ -50,7 +52,7 @@ public class ProjectCriteria extends Criteria<JobMatchContext> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/job/match/UserCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/UserCriteria.java
index 3f8af3a3c4..744aaffff0 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/UserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/UserCriteria.java
@@ -1,13 +1,15 @@
package io.onedev.server.job.match;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class UserCriteria extends Criteria<JobMatchContext> {
private static final long serialVersionUID = 1L;
@@ -40,7 +42,7 @@ public class UserCriteria extends Criteria<JobMatchContext> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentTouch.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentTouch.java
new file mode 100644
index 0000000000..ceca1faaf6
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentTouch.java
@@ -0,0 +1,58 @@
+package io.onedev.server.model;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import io.onedev.server.model.support.EntityTouch;
+import static io.onedev.server.model.CodeCommentTouch.*;
+
+@Entity
+@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList= PROP_COMMENT_ID)})
+public class CodeCommentTouch extends EntityTouch {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_PROJECT = "project";
+
+ public static final String PROP_COMMENT_ID = "commentId";
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ private Project project;
+
+ private Long commentId;
+
+ public Project getProject() {
+ return project;
+ }
+
+ public void setProject(Project project) {
+ this.project = project;
+ }
+
+ public Long getCommentId() {
+ return commentId;
+ }
+
+ public void setCommentId(Long commentId) {
+ this.commentId = commentId;
+ }
+
+ @Override
+ public Class<? extends AbstractEntity> getEntityClass() {
+ return CodeComment.class;
+ }
+
+ @Override
+ public Long getProjectId() {
+ return getProject().getId();
+ }
+
+ @Override
+ public Long getEntityId() {
+ return getCommentId();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index 8bd981ad00..41628c584d 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
@@ -1,8 +1,68 @@
package io.onedev.server.model;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import static io.onedev.server.model.AbstractEntity.PROP_NUMBER;
+import static io.onedev.server.model.Issue.PROP_BOARD_POSITION;
+import static io.onedev.server.model.Issue.PROP_COMMENT_COUNT;
+import static io.onedev.server.model.Issue.PROP_CONFUSED_COUNT;
+import static io.onedev.server.model.Issue.PROP_EYES_COUNT;
+import static io.onedev.server.model.Issue.PROP_HEART_COUNT;
+import static io.onedev.server.model.Issue.PROP_ROCKET_COUNT;
+import static io.onedev.server.model.Issue.PROP_SMILE_COUNT;
+import static io.onedev.server.model.Issue.PROP_STATE;
+import static io.onedev.server.model.Issue.PROP_SUBMIT_DATE;
+import static io.onedev.server.model.Issue.PROP_TADA_COUNT;
+import static io.onedev.server.model.Issue.PROP_THUMBS_DOWN_COUNT;
+import static io.onedev.server.model.Issue.PROP_THUMBS_UP_COUNT;
+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_ITERATION;
+import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.comparingInt;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Stack;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+import javax.mail.internet.InternetAddress;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.DynamicUpdate;
+
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
@@ -37,37 +97,20 @@ import io.onedev.server.web.util.WicketUtils;
import io.onedev.server.xodus.CommitInfoManager;
import io.onedev.server.xodus.PullRequestInfoManager;
import io.onedev.server.xodus.VisitInfoManager;
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.annotation.Nullable;
-import javax.mail.internet.InternetAddress;
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static io.onedev.server.model.AbstractEntity.PROP_NUMBER;
-import static io.onedev.server.model.Issue.*;
-import static io.onedev.server.model.IssueSchedule.NAME_ITERATION;
-import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
-import static java.util.Comparator.comparing;
-import static java.util.Comparator.comparingInt;
@Entity
@Table(
indexes={
@Index(columnList="o_project_id"), @Index(columnList=PROP_STATE),
@Index(columnList=PROP_UUID), @Index(columnList = PROP_BOARD_POSITION),
- @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= LastActivity.COLUMN_DATE),
- @Index(columnList="o_numberScope_id")},
+ @Index(columnList=PROP_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=PROP_THUMBS_UP_COUNT), @Index(columnList=PROP_THUMBS_DOWN_COUNT),
+ @Index(columnList=PROP_SMILE_COUNT), @Index(columnList=PROP_TADA_COUNT),
+ @Index(columnList=PROP_CONFUSED_COUNT), @Index(columnList=PROP_HEART_COUNT),
+ @Index(columnList=PROP_ROCKET_COUNT), @Index(columnList=PROP_EYES_COUNT),
+ @Index(columnList= LastActivity.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
@@ -157,9 +200,7 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
public static final String PROP_SCHEDULES = "schedules";
public static final String PROP_UUID = "uuid";
-
- public static final String PROP_NO_SPACE_TITLE = "noSpaceTitle";
-
+
public static final String PROP_CONFIDENTIAL = "confidential";
public static final String PROP_PIN_DATE = "pinDate";
@@ -302,12 +343,7 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
@Embedded
private LastActivity lastActivity;
-
- // used for title search in markdown editor
- @Column(nullable=false)
- @JsonIgnore
- private String noSpaceTitle;
-
+
private boolean confidential;
private Date pinDate;
@@ -395,7 +431,6 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
public void setTitle(String title) {
this.title = StringUtils.abbreviate(title, MAX_TITLE_LEN);
- noSpaceTitle = StringUtils.deleteWhitespace(this.title);
}
public String getDescription() {
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index b25ba8bd9c..a1f5a8866f 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
@@ -1,11 +1,69 @@
package io.onedev.server.model;
+import static com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY;
+import static io.onedev.commons.utils.match.WildcardUtils.matchPath;
+import static io.onedev.server.model.Project.PROP_NAME;
+import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
+import static org.apache.commons.lang3.StringUtils.replace;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.Stack;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+import javax.validation.Validator;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
+
+import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
+import org.apache.commons.collections4.map.ReferenceMap;
+import org.apache.commons.lang3.SerializationUtils;
+import org.apache.shiro.authz.Permission;
+import org.apache.tika.mime.MediaType;
+import org.apache.wicket.util.encoding.UrlEncoder;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.LastCommitsOfChildren;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.DynamicUpdate;
+
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.PathUtils;
@@ -14,10 +72,31 @@ import io.onedev.commons.utils.match.Matcher;
import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.commons.utils.match.StringMatcher;
import io.onedev.server.OneDev;
-import io.onedev.server.annotation.*;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Markdown;
+import io.onedev.server.annotation.ProjectKey;
+import io.onedev.server.annotation.ProjectName;
+import io.onedev.server.annotation.ShowCondition;
+import io.onedev.server.annotation.SubscriptionRequired;
import io.onedev.server.buildspec.BuildSpec;
-import io.onedev.server.entitymanager.*;
-import io.onedev.server.git.*;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.BuildQueryPersonalizationManager;
+import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;
+import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;
+import io.onedev.server.entitymanager.EmailAddressManager;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
+import io.onedev.server.entitymanager.PackQueryPersonalizationManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.git.BlameBlock;
+import io.onedev.server.git.Blob;
+import io.onedev.server.git.BlobIdent;
+import io.onedev.server.git.BlobIdentFilter;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.LfsObject;
import io.onedev.server.git.exception.ObjectNotFoundException;
import io.onedev.server.git.service.CommitMessageError;
import io.onedev.server.git.service.GitService;
@@ -25,8 +104,17 @@ import io.onedev.server.git.service.RefFacade;
import io.onedev.server.git.signatureverification.SignatureVerificationManager;
import io.onedev.server.git.signatureverification.VerificationSuccessful;
import io.onedev.server.model.Build.Status;
-import io.onedev.server.model.support.*;
-import io.onedev.server.model.support.build.*;
+import io.onedev.server.model.support.CodeAnalysisSetting;
+import io.onedev.server.model.support.LabelSupport;
+import io.onedev.server.model.support.NamedCodeCommentQuery;
+import io.onedev.server.model.support.NamedCommitQuery;
+import io.onedev.server.model.support.WebHook;
+import io.onedev.server.model.support.build.BuildPreservation;
+import io.onedev.server.model.support.build.DefaultFixedIssueFilter;
+import io.onedev.server.model.support.build.JobProperty;
+import io.onedev.server.model.support.build.JobSecret;
+import io.onedev.server.model.support.build.NamedBuildQuery;
+import io.onedev.server.model.support.build.ProjectBuildSetting;
import io.onedev.server.model.support.code.BranchProtection;
import io.onedev.server.model.support.code.GitPackConfig;
import io.onedev.server.model.support.code.TagProtection;
@@ -40,10 +128,8 @@ import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;
import io.onedev.server.rest.annotation.Api;
-import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.SortField;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.CollectionUtils;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.StatusInfo;
@@ -56,39 +142,6 @@ import io.onedev.server.web.page.project.setting.ContributedProjectSetting;
import io.onedev.server.web.util.ProjectAware;
import io.onedev.server.web.util.WicketUtils;
import io.onedev.server.xodus.CommitInfoManager;
-import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
-import org.apache.commons.collections4.map.ReferenceMap;
-import org.apache.commons.lang3.SerializationUtils;
-import org.apache.shiro.authz.Permission;
-import org.apache.tika.mime.MediaType;
-import org.apache.wicket.util.encoding.UrlEncoder;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.LastCommitsOfChildren;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.annotation.Nullable;
-import javax.persistence.*;
-import javax.validation.Validator;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Pattern;
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-import static com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY;
-import static io.onedev.commons.utils.match.WildcardUtils.matchPath;
-import static io.onedev.server.model.Project.PROP_NAME;
-import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
-import static org.apache.commons.lang3.StringUtils.replace;
@Entity
@Table(
@@ -279,6 +332,12 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
private Collection<IssueTouch> issueTouches = new ArrayList<>();
+
+ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
+ private Collection<PullRequestTouch> pullRequestTouches = new ArrayList<>();
+
+ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
+ private Collection<CodeCommentTouch> codeCommentTouches = new ArrayList<>();
@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index c7e7d1a325..c36b2cbed0 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -49,14 +49,18 @@ import static java.lang.ThreadLocal.withInitial;
@Table(
indexes={
@Index(columnList=PROP_TITLE), @Index(columnList=PROP_UUID),
- @Index(columnList=PROP_NO_SPACE_TITLE), @Index(columnList=PROP_NUMBER),
- @Index(columnList="o_targetProject_id"), @Index(columnList=PROP_SUBMIT_DATE),
- @Index(columnList= LastActivity.COLUMN_DATE), @Index(columnList="o_sourceProject_id"),
- @Index(columnList="o_submitter_id"), @Index(columnList=MergePreview.COLUMN_HEAD_COMMIT_HASH),
- @Index(columnList=PROP_SUBMIT_MONTH), @Index(columnList=PROP_SUBMIT_WEEK),
- @Index(columnList=PROP_SUBMIT_DAY), @Index(columnList=PROP_CLOSE_MONTH),
- @Index(columnList=PROP_CLOSE_WEEK), @Index(columnList=PROP_CLOSE_DAY),
- @Index(columnList=PROP_STATUS), @Index(columnList="o_numberScope_id")},
+ @Index(columnList=PROP_NUMBER), @Index(columnList="o_targetProject_id"),
+ @Index(columnList=PROP_SUBMIT_DATE), @Index(columnList= LastActivity.COLUMN_DATE),
+ @Index(columnList="o_sourceProject_id"), @Index(columnList="o_submitter_id"),
+ @Index(columnList=MergePreview.COLUMN_HEAD_COMMIT_HASH), @Index(columnList=PROP_SUBMIT_MONTH),
+ @Index(columnList=PROP_SUBMIT_WEEK), @Index(columnList=PROP_SUBMIT_DAY),
+ @Index(columnList=PROP_CLOSE_MONTH), @Index(columnList=PROP_CLOSE_WEEK),
+ @Index(columnList=PROP_CLOSE_DAY), @Index(columnList=PROP_STATUS),
+ @Index(columnList=PROP_THUMBS_UP_COUNT), @Index(columnList=PROP_THUMBS_DOWN_COUNT),
+ @Index(columnList=PROP_SMILE_COUNT), @Index(columnList=PROP_TADA_COUNT),
+ @Index(columnList=PROP_CONFUSED_COUNT), @Index(columnList=PROP_HEART_COUNT),
+ @Index(columnList=PROP_ROCKET_COUNT), @Index(columnList=PROP_EYES_COUNT),
+ @Index(columnList=PROP_COMMENT_COUNT), @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
@@ -161,8 +165,6 @@ public class PullRequest extends ProjectBelonging
public static final String PROP_UUID = "uuid";
- public static final String PROP_NO_SPACE_TITLE = "noSpaceTitle";
-
public static final String PROP_DURATION = "duration";
public static final String PROP_SUBMIT_TIME_GROUPS = "submitTimeGroups";
@@ -265,12 +267,7 @@ public class PullRequest extends ProjectBelonging
@Column
private String buildCommitHash;
-
- // used for title search in markdown editor
- @Column(nullable=false)
- @JsonIgnore
- private String noSpaceTitle;
-
+
@JsonIgnore
@Embedded
private MergePreview mergePreview;
@@ -306,6 +303,22 @@ public class PullRequest extends ProjectBelonging
private int commentCount;
+ private int thumbsUpCount;
+
+ private int thumbsDownCount;
+
+ private int smileCount;
+
+ private int tadaCount;
+
+ private int confusedCount;
+
+ private int heartCount;
+
+ private int rocketCount;
+
+ private int eyesCount;
+
@Embedded
private LastActivity lastActivity;
@@ -374,22 +387,12 @@ public class PullRequest extends ProjectBelonging
private transient Optional<CommitMessageError> commitMessageErrorOpt;
- private int thumbsUpCount;
- private int thumbsDownCount;
- private int smileCount;
- private int tadaCount;
- private int confusedCount;
- private int heartCount;
- private int rocketCount;
- private int eyesCount;
-
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = StringUtils.abbreviate(title, MAX_TITLE_LEN);
- noSpaceTitle = StringUtils.deleteWhitespace(this.title);
}
public String getDescription() {
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestTouch.java b/server-core/src/main/java/io/onedev/server/model/PullRequestTouch.java
new file mode 100644
index 0000000000..a4c158873b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestTouch.java
@@ -0,0 +1,58 @@
+package io.onedev.server.model;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import io.onedev.server.model.support.EntityTouch;
+import static io.onedev.server.model.PullRequestTouch.*;
+
+@Entity
+@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList= PROP_REQUEST_ID)})
+public class PullRequestTouch extends EntityTouch {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_PROJECT = "project";
+
+ public static final String PROP_REQUEST_ID = "requestId";
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ private Project project;
+
+ private Long requestId;
+
+ public Project getProject() {
+ return project;
+ }
+
+ public void setProject(Project project) {
+ this.project = project;
+ }
+
+ public Long getRequestId() {
+ return requestId;
+ }
+
+ public void setRequestId(Long requestId) {
+ this.requestId = requestId;
+ }
+
+ @Override
+ public Class<? extends AbstractEntity> getEntityClass() {
+ return PullRequest.class;
+ }
+
+ @Override
+ public Long getProjectId() {
+ return getProject().getId();
+ }
+
+ @Override
+ public Long getEntityId() {
+ return getRequestId();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java
index c5ce3d272b..b513fb749f 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,5 +1,6 @@
package io.onedev.server.search.entity.agent;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -9,6 +10,7 @@ import javax.persistence.criteria.Subquery;
import io.onedev.server.model.Agent;
import io.onedev.server.model.AgentAttribute;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class AttributeCriteria extends Criteria<Agent> {
@@ -28,7 +30,7 @@ public class AttributeCriteria extends Criteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Subquery<AgentAttribute> attributeQuery = query.subquery(AgentAttribute.class);
Root<AgentAttribute> attributeRoot = attributeQuery.from(AgentAttribute.class);
attributeQuery.select(attributeRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java
index 235eae020f..5dabaebe0e 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
@@ -1,18 +1,5 @@
package io.onedev.server.search.entity.agent;
-import java.util.Date;
-
-import javax.persistence.criteria.*;
-
-import io.onedev.server.model.Agent;
-import io.onedev.server.model.AgentLastUsedDate;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.ProjectLastEventDate;
-import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.search.entity.project.ProjectQuery;
-import io.onedev.server.search.entity.project.ProjectQueryLexer;
-import io.onedev.server.util.criteria.Criteria;
-
import static io.onedev.server.model.Agent.PROP_LAST_USED_DATE;
import static io.onedev.server.model.AgentLastUsedDate.PROP_VALUE;
import static io.onedev.server.search.entity.EntityQuery.getDateValue;
@@ -20,6 +7,19 @@ import static io.onedev.server.search.entity.EntityQuery.getPath;
import static io.onedev.server.search.entity.agent.AgentQuery.getRuleName;
import static io.onedev.server.search.entity.agent.AgentQueryLexer.EverUsedSince;
+import java.util.Date;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class EverUsedSinceCriteria extends Criteria<Agent> {
private static final long serialVersionUID = 1L;
@@ -34,7 +34,7 @@ public class EverUsedSinceCriteria extends Criteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Path<Date> attribute = getPath(from, PROP_LAST_USED_DATE + "." + PROP_VALUE);
return builder.and(builder.isNotNull(attribute), builder.greaterThan(attribute, date));
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.java
index 81f9f914d9..5fce3e8eda 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/FuzzyCriteria.java
@@ -1,16 +1,18 @@
package io.onedev.server.search.entity.agent;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.model.Agent;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.criteria.OrCriteria;
+import static io.onedev.server.search.entity.agent.AgentQueryLexer.Is;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import static io.onedev.server.search.entity.agent.AgentQueryLexer.Is;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.model.Agent;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.util.criteria.OrCriteria;
public class FuzzyCriteria extends Criteria<Agent> {
@@ -23,8 +25,8 @@ public class FuzzyCriteria extends Criteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
- return parse(value).getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ return parse(value).getPredicate(projectScope, query, from, builder);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java
index d888358b54..1c64da04c4 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,5 +1,6 @@
package io.onedev.server.search.entity.agent;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Subquery;
import io.onedev.server.model.Agent;
import io.onedev.server.model.AgentAttribute;
import io.onedev.server.model.BuildParam;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class HasAttributeCriteria extends Criteria<Agent> {
@@ -23,7 +25,7 @@ public class HasAttributeCriteria extends Criteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Subquery<AgentAttribute> attributeQuery = query.subquery(AgentAttribute.class);
Root<AgentAttribute> attribute = attributeQuery.from(AgentAttribute.class);
attributeQuery.select(attribute);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java
index 0a625076ca..266d6cc79a 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,5 +1,6 @@
package io.onedev.server.search.entity.agent;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -11,6 +12,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.model.Agent;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class HasRunningBuildsCriteria extends Criteria<Agent> {
@@ -18,7 +20,7 @@ public class HasRunningBuildsCriteria extends Criteria<Agent> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Join<?, ?> join = from.join(Agent.PROP_BUILDS, JoinType.LEFT);
join.on(builder.equal(join.get(Build.PROP_STATUS), Build.Status.RUNNING));
return join.isNotNull();
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java
index d8cffdb3b5..91285ad10e 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,14 +1,16 @@
package io.onedev.server.search.entity.agent;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Agent;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class IpAddressCriteria extends Criteria<Agent> {
@@ -24,7 +26,7 @@ public class IpAddressCriteria extends Criteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Agent.PROP_IP_ADDRESS);
String normalized = value.toLowerCase().replace("*", "%");
var predicate = builder.like(builder.lower(attribute), normalized);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java
index cb4cb8ff37..1ac5456699 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,14 +1,16 @@
package io.onedev.server.search.entity.agent;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Agent;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class NameCriteria extends Criteria<Agent> {
@@ -24,7 +26,7 @@ public class NameCriteria extends Criteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Agent.PROP_NAME);
String normalized = value.toLowerCase().replace("*", "%");
var predicate = builder.like(builder.lower(attribute), normalized);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java
index 6b9570df5b..6a6c471749 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
@@ -1,19 +1,25 @@
package io.onedev.server.search.entity.agent;
+import static io.onedev.server.model.Agent.PROP_LAST_USED_DATE;
+import static io.onedev.server.model.AgentLastUsedDate.PROP_VALUE;
+import static io.onedev.server.search.entity.EntityQuery.getPath;
+import static io.onedev.server.search.entity.agent.AgentQuery.getRuleName;
+import static io.onedev.server.search.entity.agent.AgentQueryLexer.NotUsedSince;
+
import java.util.Date;
-import javax.persistence.criteria.*;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Agent;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import static io.onedev.server.model.Agent.PROP_LAST_USED_DATE;
-import static io.onedev.server.model.AgentLastUsedDate.PROP_VALUE;
-import static io.onedev.server.search.entity.EntityQuery.getPath;
-import static io.onedev.server.search.entity.agent.AgentQuery.getRuleName;
-import static io.onedev.server.search.entity.agent.AgentQueryLexer.NotUsedSince;
-
public class NotUsedSinceCriteria extends Criteria<Agent> {
private static final long serialVersionUID = 1L;
@@ -28,7 +34,7 @@ public class NotUsedSinceCriteria extends Criteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Path<Date> attribute = getPath(from, PROP_LAST_USED_DATE + "." + PROP_VALUE);
return builder.or(builder.isNull(attribute), builder.lessThan(attribute, 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.java
index c6cd9a8075..f14b5b71a1 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,11 +1,13 @@
package io.onedev.server.search.entity.agent;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Agent;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class OfflineCriteria extends Criteria<Agent> {
@@ -13,8 +15,8 @@ public class OfflineCriteria extends Criteria<Agent> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
- return builder.not(new OnlineCriteria().getPredicate(query, from, builder));
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ return builder.not(new OnlineCriteria().getPredicate(projectScope, query, from, builder));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java
index edf52c47c8..2c2a108dbc 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
@@ -1,19 +1,26 @@
package io.onedev.server.search.entity.agent;
+import java.util.Collection;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.AgentManager;
import io.onedev.server.model.Agent;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-import java.util.Collection;
-
public class OnlineCriteria extends Criteria<Agent> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Path<?> attribute = from.get(Agent.PROP_ID);
var agentManager = OneDev.getInstance(AgentManager.class);
Collection<Long> agentIds = agentManager.getOnlineAgents();
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
index 27d0e9a859..7f2255deff 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,14 +1,16 @@
package io.onedev.server.search.entity.agent;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Agent;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class OsArchCriteria extends Criteria<Agent> {
@@ -24,7 +26,7 @@ public class OsArchCriteria extends Criteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Agent.PROP_OS_ARCH);
String normalized = value.toLowerCase().replace("*", "%");
var predicate = builder.like(builder.lower(attribute), normalized);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java
index 86cd8eaba9..cc661ec9d6 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,11 +1,13 @@
package io.onedev.server.search.entity.agent;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Agent;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class OsCriteria extends Criteria<Agent> {
@@ -22,7 +24,7 @@ public class OsCriteria extends Criteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
String normalized = value.toLowerCase().replace("*", "%");
var predicate = builder.like(builder.lower(from.get(Agent.PROP_OS_NAME)), normalized);
if (operator == AgentQueryLexer.IsNot)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java
index 81ecebbd50..32240e3e63 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,14 +1,16 @@
package io.onedev.server.search.entity.agent;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Agent;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class OsVersionCriteria extends Criteria<Agent> {
@@ -24,7 +26,7 @@ public class OsVersionCriteria extends Criteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Agent.PROP_OS_VERSION);
String normalized = value.toLowerCase().replace("*", "%");
var predicate = builder.like(builder.lower(attribute), normalized);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java
index 61848a984f..ee9476c6cc 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,11 +1,13 @@
package io.onedev.server.search.entity.agent;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Agent;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class PausedCriteria extends Criteria<Agent> {
@@ -13,7 +15,7 @@ public class PausedCriteria extends Criteria<Agent> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
return builder.equal(from.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.java
index 10ae67f4c5..7f2db257a5 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,5 +1,6 @@
package io.onedev.server.search.entity.agent;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Agent;
import io.onedev.server.model.Build;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class RanBuildCriteria extends Criteria<Agent> {
@@ -26,7 +28,7 @@ public class RanBuildCriteria extends Criteria<Agent> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Join<?, ?> join = from.join(Agent.PROP_BUILDS, JoinType.LEFT);
join.on(builder.equal(join, build));
return join.isNotNull();
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java
index e72af0cf89..e523c94f03 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,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -8,9 +9,10 @@ import javax.persistence.criteria.Predicate;
import org.eclipse.jgit.lib.Constants;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class BranchCriteria extends Criteria<Build> {
@@ -26,7 +28,7 @@ public class BranchCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Build.PROP_REF_NAME);
String normalized = Constants.R_HEADS + value.toLowerCase().replace("*", "%");
var predicate = builder.like(builder.lower(attribute), normalized);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchEmptyCriteria.java
index 0309ce4501..86e44f8a27 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchEmptyCriteria.java
@@ -1,10 +1,17 @@
package io.onedev.server.search.entity.build;
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import org.eclipse.jgit.lib.Constants;
-import javax.persistence.criteria.*;
+import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class BranchEmptyCriteria extends Criteria<Build> {
@@ -17,7 +24,7 @@ public class BranchEmptyCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Build.PROP_REF_NAME);
var predicate = 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.java
index 0bdcaff1b4..1a8b019c98 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.Objects;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class CancelledByCriteria extends Criteria<Build> {
@@ -23,7 +25,7 @@ public class CancelledByCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<User> attribute = from.get(Build.PROP_CANCELLER);
return builder.equal(attribute, user);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
index 30a05b1a64..5d68906744 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,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -9,6 +10,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class CancelledByMeCriteria extends Criteria<Build> {
@@ -16,7 +18,7 @@ public class CancelledByMeCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
if (User.get() != null) {
Path<User> attribute = from.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.java
index 1cf4b9cf29..a598b8f7b1 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,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class CancelledCriteria extends Criteria<Build> {
@@ -14,7 +16,7 @@ public class CancelledCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<?> attribute = from.get(Build.PROP_STATUS);
return builder.equal(attribute, Build.Status.CANCELLED);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
index c5a73e083f..e5d906a293 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,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class CommitCriteria extends Criteria<Build> {
@@ -29,7 +31,7 @@ public class CommitCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<?> projectAttribute = BuildQuery.getPath(from, Build.PROP_PROJECT);
Path<?> commitAttribute = BuildQuery.getPath(from, Build.PROP_COMMIT_HASH);
var predicate = 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.java
index fb237e3376..c9e0f43bdd 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
@@ -12,6 +12,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.BuildDependence;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class DependenciesOfCriteria extends Criteria<Build> {
@@ -28,7 +29,7 @@ public class DependenciesOfCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Join<?, ?> join = from.join(Build.PROP_DEPENDENTS, JoinType.LEFT);
join.on(builder.equal(join.get(BuildDependence.PROP_DEPENDENT), build));
return join.isNotNull();
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java
index 84b97df8a3..ee2005c26e 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
@@ -12,6 +12,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.BuildDependence;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class DependsOnCriteria extends Criteria<Build> {
@@ -28,7 +29,7 @@ public class DependsOnCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Join<?, ?> join = from.join(Build.PROP_DEPENDENCIES, JoinType.LEFT);
join.on(builder.equal(join.get(BuildDependence.PROP_DEPENDENCY), build));
return join.isNotNull();
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
index 049fa9f94a..dc10cbf967 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,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class FailedCriteria extends Criteria<Build> {
@@ -14,7 +16,7 @@ public class FailedCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<?> attribute = from.get(Build.PROP_STATUS);
return builder.equal(attribute, Build.Status.FAILED);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
index 2ee77e232d..e17553e452 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.Date;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class FinishDateCriteria extends Criteria<Build> {
@@ -29,7 +31,7 @@ public class FinishDateCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<Date> attribute = from.get(Build.PROP_FINISH_DATE);
if (operator == BuildQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.java
index f6c74cee5a..f493238aec 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class FinishedCriteria extends Criteria<Build> {
@@ -14,7 +16,7 @@ public class FinishedCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<?> attribute = from.get(Build.PROP_STATUS);
return builder.or(
builder.equal(attribute, Build.Status.SUCCESSFUL),
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
index 4b56b5ffc0..f8aad1f81c 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
@@ -17,12 +17,13 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.service.GitService;
-import io.onedev.server.xodus.CommitInfoManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.xodus.CommitInfoManager;
public class FixedIssueCriteria extends Criteria<Build> {
@@ -47,7 +48,7 @@ public class FixedIssueCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
Path<Long> attribute = from.get(Build.PROP_NUMBER);
List<Predicate> predicates = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.java
index ce5c920107..34bcc2222a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FuzzyCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.build;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.criteria.OrCriteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.util.criteria.OrCriteria;
+
public class FuzzyCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@@ -21,8 +23,8 @@ public class FuzzyCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
- return parse(value).getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ return parse(value).getPredicate(projectScope, query, from, builder);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
index 7ffed5bb51..8eff9241a4 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,14 +1,16 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class JobCriteria extends Criteria<Build> {
@@ -24,7 +26,7 @@ public class JobCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Build.PROP_JOB_NAME);
String normalized = jobName.toLowerCase().replace("*", "%");
var predicate = builder.like(builder.lower(attribute), normalized);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java
index 4dd9ab64f4..f6095d55b7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.build;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.BuildLabel;
-import io.onedev.server.model.LabelSpec;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.BuildLabel;
+import io.onedev.server.model.LabelSpec;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class LabelCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@@ -24,7 +26,7 @@ public class LabelCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
var labelQuery = query.subquery(BuildLabel.class);
var labelRoot = labelQuery.from(BuildLabel.class);
labelQuery.select(labelRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java
index c7d4917786..c20748a7be 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.List;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -11,6 +12,7 @@ import javax.persistence.criteria.Subquery;
import io.onedev.server.model.Build;
import io.onedev.server.model.BuildParam;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ParamCriteria extends Criteria<Build> {
@@ -30,7 +32,7 @@ public class ParamCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Subquery<BuildParam> paramQuery = query.subquery(BuildParam.class);
Root<BuildParam> paramRoot = paramQuery.from(BuildParam.class);
paramQuery.select(paramRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamEmptyCriteria.java
index d4d2f3a742..49c0b5b8ac 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamEmptyCriteria.java
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.List;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -11,6 +12,7 @@ import javax.persistence.criteria.Subquery;
import io.onedev.server.model.Build;
import io.onedev.server.model.BuildParam;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ParamEmptyCriteria extends Criteria<Build> {
@@ -27,7 +29,7 @@ public class ParamEmptyCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Subquery<BuildParam> paramQuery = query.subquery(BuildParam.class);
Root<BuildParam> paramRoot = paramQuery.from(BuildParam.class);
paramQuery.select(paramRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java
index 5940bcd44d..e1039ae522 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,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class PendingCriteria extends Criteria<Build> {
@@ -14,7 +16,7 @@ public class PendingCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<?> attribute = from.get(Build.PROP_STATUS);
return builder.equal(attribute, Build.Status.PENDING);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java
index 1dc9f2f765..ab80151e78 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.Date;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class PendingDateCriteria extends Criteria<Build> {
@@ -29,7 +31,7 @@ public class PendingDateCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<Date> attribute = from.get(Build.PROP_PENDING_DATE);
if (operator == BuildQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java
index 99c5aa41bb..6c3ba7d43e 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,16 +1,18 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class ProjectCriteria extends Criteria<Build> {
@@ -26,7 +28,7 @@ public class ProjectCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
var predicate = OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(
builder, from.join(Build.PROP_PROJECT, JoinType.INNER), projectPath);
if (operator == BuildQueryLexer.IsNot)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestCriteria.java
index 5df8c5bb21..b5f4c434e9 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
@@ -11,6 +11,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class PullRequestCriteria extends Criteria<Build> {
@@ -30,7 +31,7 @@ public class PullRequestCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<PullRequest> attribute = from.get(Build.PROP_PULL_REQUEST);
var predicate = builder.equal(attribute, request);
if (operator == BuildQueryLexer.IsNot)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestEmptyCriteria.java
index b28ef22153..a60f273aca 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PullRequestEmptyCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class PullRequestEmptyCriteria extends Criteria<Build> {
@@ -19,7 +21,7 @@ public class PullRequestEmptyCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
var predicate = builder.isNull(from.get(Build.PROP_PULL_REQUEST));
if (operator == BuildQueryLexer.IsNotEmpty)
predicate = builder.not(predicate);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java
index 1fbc073d9d..1720744178 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,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -12,6 +13,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.AgentManager;
import io.onedev.server.model.Agent;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class RanOnCriteria extends Criteria<Build> {
@@ -27,7 +29,7 @@ public class RanOnCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Join<?, ?> join = from.join(Build.PROP_AGENT, JoinType.INNER);
join.on(builder.equal(join.get(Agent.PROP_NAME), value));
return join.isNotNull();
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ReferenceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ReferenceCriteria.java
index 3a91606b04..e932101756 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ReferenceCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ReferenceCriteria.java
@@ -1,13 +1,18 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.entityreference.BuildReference;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.annotation.Nullable;
-import javax.persistence.criteria.*;
-
public class ReferenceCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@@ -25,7 +30,7 @@ public class ReferenceCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<Long> attribute = from.get(Build.PROP_NUMBER);
Predicate numberPredicate;
if (operator == BuildQueryLexer.Is)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
index 272f4b5c86..8136d74252 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,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class RunningCriteria extends Criteria<Build> {
@@ -14,7 +16,7 @@ public class RunningCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<?> attribute = from.get(Build.PROP_STATUS);
return builder.equal(attribute, Build.Status.RUNNING);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
index 2b0a746290..3ed08cb1f9 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.Date;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class RunningDateCriteria extends Criteria<Build> {
@@ -29,7 +31,7 @@ public class RunningDateCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<Date> attribute = from.get(Build.PROP_RUNNING_DATE);
if (operator == BuildQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/StatusCriteria.java
index 559f35927f..c8152d8101 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/StatusCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/StatusCriteria.java
@@ -1,13 +1,13 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
-import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import com.hazelcast.internal.monitor.impl.GlobalPerIndexStats;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class StatusCriteria extends Criteria<Build> {
@@ -24,7 +24,7 @@ public class StatusCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
var predicate = builder.equal(from.get(Build.PROP_STATUS), status);
if (operator == BuildQueryLexer.IsNot)
predicate = builder.not(predicate);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
index 4772bbc18a..06d46dc893 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.Date;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class SubmitDateCriteria extends Criteria<Build> {
@@ -29,7 +31,7 @@ public class SubmitDateCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<Date> attribute = from.get(Build.PROP_SUBMIT_DATE);
if (operator == BuildQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java
index dcc5ca87f9..9a86079e86 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.build;
import java.util.Objects;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class SubmittedByCriteria extends Criteria<Build> {
@@ -23,7 +25,7 @@ public class SubmittedByCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<User> attribute = from.get(Build.PROP_SUBMITTER);
return builder.equal(attribute, user);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
index 5b14b50382..4d95ac143e 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,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -9,6 +10,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class SubmittedByMeCriteria extends Criteria<Build> {
@@ -16,7 +18,7 @@ public class SubmittedByMeCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
if (User.get() != null) {
Path<User> attribute = from.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.java
index 0a006608c5..d2b7c5e826 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,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class SuccessfulCriteria extends Criteria<Build> {
@@ -14,7 +16,7 @@ public class SuccessfulCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<?> attribute = from.get(Build.PROP_STATUS);
return builder.equal(attribute, Build.Status.SUCCESSFUL);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java
index 9e9aced16f..0bff625412 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,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -8,9 +9,10 @@ import javax.persistence.criteria.Predicate;
import org.eclipse.jgit.lib.Constants;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class TagCriteria extends Criteria<Build> {
@@ -26,7 +28,7 @@ public class TagCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Build.PROP_REF_NAME);
String normalized = Constants.R_TAGS + value.toLowerCase().replace("*", "%");
var predicate = builder.like(builder.lower(attribute), normalized);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TagEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TagEmptyCriteria.java
index 992568f04d..1e58aca83a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TagEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TagEmptyCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -9,6 +10,7 @@ import javax.persistence.criteria.Predicate;
import org.eclipse.jgit.lib.Constants;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class TagEmptyCriteria extends Criteria<Build> {
@@ -22,7 +24,7 @@ public class TagEmptyCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Build.PROP_REF_NAME);
var predicate = 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.java
index ca00c7dabc..020a125e71 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,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class TimedOutCriteria extends Criteria<Build> {
@@ -14,7 +16,7 @@ public class TimedOutCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<?> attribute = from.get(Build.PROP_STATUS);
return builder.equal(attribute, Build.Status.TIMED_OUT);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
index 96055a2feb..cb08355ae8 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,14 +1,16 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class VersionCriteria extends Criteria<Build> {
@@ -24,7 +26,7 @@ public class VersionCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Build.PROP_VERSION);
String normalized = value.toLowerCase().replace("*", "%");
var predicate = builder.like(builder.lower(attribute), normalized);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionEmptyCriteria.java
index 4ca3c5223d..7896890763 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionEmptyCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class VersionEmptyCriteria extends Criteria<Build> {
@@ -19,7 +21,7 @@ public class VersionEmptyCriteria extends Criteria<Build> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
var predicate = builder.isNull(from.get(Build.PROP_VERSION));
if (operator == BuildQueryLexer.IsNotEmpty)
predicate = builder.not(predicate);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java
index 58e6f1ded7..b12ee07ee1 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,5 +1,6 @@
package io.onedev.server.search.entity.build;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class WaitingCriteria extends Criteria<Build> {
@@ -14,7 +16,7 @@ public class WaitingCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<?> attribute = from.get(Build.PROP_STATUS);
return builder.equal(attribute, Build.Status.WAITING);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
index f2d16b96dd..73ce576c5a 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,14 +1,16 @@
package io.onedev.server.search.entity.codecomment;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.CodeComment;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class ContentCriteria extends Criteria<CodeComment> {
@@ -21,7 +23,7 @@ public class ContentCriteria extends Criteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
Expression<String> attribute = from.get(CodeComment.PROP_CONTENT);
return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
index 2ef7eb844b..e465222fc2 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.codecomment;
import java.util.Date;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -9,6 +10,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.CodeComment;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class CreateDateCriteria extends Criteria<CodeComment> {
@@ -28,7 +30,7 @@ public class CreateDateCriteria extends Criteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
Path<Date> attribute = from.get(CodeComment.PROP_CREATE_DATE);
if (operator == CodeCommentQueryLexer.IsUntil)
return builder.lessThan(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
index 0631ca2fdd..b24cfe2023 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.codecomment;
import java.util.Objects;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class CreatedByCriteria extends Criteria<CodeComment> {
@@ -23,7 +25,7 @@ public class CreatedByCriteria extends Criteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
Path<User> attribute = from.get(CodeComment.PROP_USER);
return builder.equal(attribute, user);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
index 3aca60624b..4c90e112f6 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,5 +1,6 @@
package io.onedev.server.search.entity.codecomment;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -9,6 +10,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class CreatedByMeCriteria extends Criteria<CodeComment> {
@@ -16,7 +18,7 @@ public class CreatedByMeCriteria extends Criteria<CodeComment> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
if (User.get() != null) {
Path<?> attribute = from.get(CodeComment.PROP_USER);
return builder.equal(attribute, User.get());
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java
index 4e0ba70510..72c2a4aa95 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/FuzzyCriteria.java
@@ -1,51 +1,69 @@
package io.onedev.server.search.entity.codecomment;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.util.criteria.AndCriteria;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.criteria.OrCriteria;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.Order;
import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
-import static io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer.Is;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.search.entitytext.CodeCommentTextManager;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class FuzzyCriteria extends Criteria<CodeComment> {
private static final long serialVersionUID = 1L;
+ private static final int MAX_TEXT_QUERY_COUNT = 1000;
+
private final String value;
+
+ private transient List<Long> commentIds;
public FuzzyCriteria(String value) {
this.value = value;
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
- return parse(value).getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ if (value.length() == 0)
+ return builder.conjunction();
+ var project = projectScope!=null? projectScope.getProject(): null;
+ commentIds = OneDev.getInstance(CodeCommentTextManager.class).query(project, value, MAX_TEXT_QUERY_COUNT);
+ if (commentIds.isEmpty())
+ return builder.disjunction();
+ else
+ return builder.in(from.get(CodeComment.PROP_ID)).value(commentIds);
}
@Override
public boolean matches(CodeComment comment) {
- return parse(value).matches(comment);
+ if (value.length() == 0)
+ return true;
+ else
+ return OneDev.getInstance(CodeCommentTextManager.class).matches(comment, value);
}
-
- private Criteria<CodeComment> parse(String value) {
- var terms = normalizeFuzzyQuery(value);
- var contentCriteria = new ArrayList<Criteria<CodeComment>>();
- var replyCriteria = new ArrayList<Criteria<CodeComment>>();
- var pathCriterias = new ArrayList<Criteria<CodeComment>>();
- for (var term: terms) {
- contentCriteria.add(new ContentCriteria(term));
- replyCriteria.add(new ReplyCriteria(term));
- pathCriterias.add(new PathCriteria("*" + term + "*", Is));
+
+ @Override
+ public List<Order> getPreferOrders(CriteriaBuilder builder, From<CodeComment, CodeComment> from) {
+ if (commentIds != null && !commentIds.isEmpty()) {
+ var orders = new ArrayList<Order>();
+ var orderCase = builder.selectCase();
+ for (int i = 0; i < commentIds.size(); i++)
+ orderCase.when(builder.equal(from.get(CodeComment.PROP_ID), commentIds.get(i)), i);
+ orders.add(builder.asc(orderCase.otherwise(commentIds.size())));
+ return orders;
+ } else {
+ return new ArrayList<>();
}
- return new OrCriteria<>(new AndCriteria<>(contentCriteria), new AndCriteria<>(replyCriteria), new AndCriteria<>(pathCriterias));
- }
+ }
@Override
public String toStringWithoutParens() {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java
index f1ae482b66..ead76bea19 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.codecomment;
import java.util.Date;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.support.LastActivity;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class LastActivityDateCriteria extends Criteria<CodeComment> {
@@ -29,7 +31,7 @@ public class LastActivityDateCriteria extends Criteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
Path<Date> attribute = CodeCommentQuery.getPath(from, CodeComment.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE);
if (operator == CodeCommentQueryLexer.IsUntil)
return builder.lessThan(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedCriteria.java
index a5aad158f1..7c6a86a5f5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedCriteria.java
@@ -1,12 +1,19 @@
package io.onedev.server.search.entity.codecomment;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentMention;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class MentionedCriteria extends Criteria<CodeComment> {
private static final long serialVersionUID = 1L;
@@ -18,7 +25,7 @@ public class MentionedCriteria extends Criteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
Subquery<CodeCommentMention> mentionQuery = query.subquery(CodeCommentMention.class);
Root<CodeCommentMention> mention = mentionQuery.from(CodeCommentMention.class);
mentionQuery.select(mention);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java
index 74fbd99011..79ebe62925 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java
@@ -1,19 +1,26 @@
package io.onedev.server.search.entity.codecomment;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentMention;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class MentionedMeCriteria extends Criteria<CodeComment> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
if (User.get() != null) {
Subquery<CodeCommentMention> mentionQuery = query.subquery(CodeCommentMention.class);
Root<CodeCommentMention> mention = mentionQuery.from(CodeCommentMention.class);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java
index 23ede6d2e6..ca8ca4e141 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,5 +1,6 @@
package io.onedev.server.search.entity.codecomment;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -11,6 +12,7 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.Mark;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class OnCommitCriteria extends Criteria<CodeComment> {
@@ -27,7 +29,7 @@ public class OnCommitCriteria extends Criteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
Path<?> projectAttribute = CodeCommentQuery.getPath(from, CodeComment.PROP_PROJECT);
Path<?> commitAttribute = CodeCommentQuery.getPath(from, CodeComment.PROP_MARK + "." + Mark.PROP_COMMIT_HASH);
return builder.and(
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
index c1bb7d86c8..037b8bc4d3 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,15 +1,17 @@
package io.onedev.server.search.entity.codecomment;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.support.Mark;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class PathCriteria extends Criteria<CodeComment> {
@@ -25,7 +27,7 @@ public class PathCriteria extends Criteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
Path<String> attribute = CodeCommentQuery.getPath(from, CodeComment.PROP_MARK + "." + Mark.PROP_PATH);
String normalized = value.toLowerCase().replace('*', '%');
if (normalized.endsWith("/"))
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByCriteria.java
index 3d908e346e..86e061d4fc 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByCriteria.java
@@ -1,12 +1,19 @@
package io.onedev.server.search.entity.codecomment;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class RepliedByCriteria extends Criteria<CodeComment> {
private static final long serialVersionUID = 1L;
@@ -18,7 +25,7 @@ public class RepliedByCriteria extends Criteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
Subquery<CodeCommentReply> replyQuery = query.subquery(CodeCommentReply.class);
Root<CodeCommentReply> reply = replyQuery.from(CodeCommentReply.class);
replyQuery.select(reply);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java
index bdea84ab9f..d641dac6ce 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java
@@ -1,19 +1,26 @@
package io.onedev.server.search.entity.codecomment;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class RepliedByMeCriteria extends Criteria<CodeComment> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
if (User.get() != null) {
Subquery<CodeCommentReply> replyQuery = query.subquery(CodeCommentReply.class);
Root<CodeCommentReply> reply = replyQuery.from(CodeCommentReply.class);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
index 0f65289964..aa5cf94c7d 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,5 +1,6 @@
package io.onedev.server.search.entity.codecomment;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.CodeComment;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ReplyCountCriteria extends Criteria<CodeComment> {
@@ -23,7 +25,7 @@ public class ReplyCountCriteria extends Criteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(CodeComment.PROP_REPLY_COUNT);
if (operator == CodeCommentQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
index ab2625d4d5..59e0205375 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,14 +1,22 @@
package io.onedev.server.search.entity.codecomment;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.CodeCommentReply;
-import io.onedev.server.util.criteria.Criteria;
+import static io.onedev.commons.utils.match.WildcardUtils.matchString;
-import javax.persistence.criteria.*;
import java.util.ArrayList;
import java.util.List;
-import static io.onedev.commons.utils.match.WildcardUtils.matchString;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentReply;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class ReplyCriteria extends Criteria<CodeComment> {
@@ -21,7 +29,7 @@ public class ReplyCriteria extends Criteria<CodeComment> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
Subquery<CodeCommentReply> replyQuery = query.subquery(CodeCommentReply.class);
Root<CodeCommentReply> replyRoot = replyQuery.from(CodeCommentReply.class);
replyQuery.select(replyRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java
index 9b01125b39..b2ff232d91 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.search.entity.codecomment;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.CodeComment;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ResolvedCriteria extends Criteria<CodeComment> {
@@ -13,7 +15,7 @@ public class ResolvedCriteria extends Criteria<CodeComment> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
return builder.equal(from.get(CodeComment.PROP_RESOLVED), true);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java
index 3216a62749..9d4374689e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.search.entity.codecomment;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.CodeComment;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class UnresolvedCriteria extends Criteria<CodeComment> {
@@ -13,7 +15,7 @@ public class UnresolvedCriteria extends Criteria<CodeComment> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
return builder.equal(from.get(CodeComment.PROP_RESOLVED), false);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
index e3391bb4c5..e292435207 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,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class CommentCountCriteria extends Criteria<Issue> {
@@ -23,7 +25,7 @@ public class CommentCountCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(Issue.PROP_COMMENT_COUNT);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
index d13e1b69d8..d7c58d9ad5 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,14 +1,22 @@
package io.onedev.server.search.entity.issue;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueComment;
-import io.onedev.server.util.criteria.Criteria;
+import static io.onedev.commons.utils.match.WildcardUtils.matchString;
-import javax.persistence.criteria.*;
import java.util.ArrayList;
import java.util.List;
-import static io.onedev.commons.utils.match.WildcardUtils.matchString;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueComment;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class CommentCriteria extends Criteria<Issue> {
@@ -21,7 +29,7 @@ public class CommentCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Subquery<IssueComment> commentQuery = query.subquery(IssueComment.class);
Root<IssueComment> commentRoot = commentQuery.from(IssueComment.class);
commentQuery.select(commentRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByCriteria.java
index f517c48d12..14e8cf9386 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByCriteria.java
@@ -1,12 +1,19 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class CommentedByCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@@ -18,7 +25,7 @@ public class CommentedByCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Subquery<IssueComment> commentQuery = query.subquery(IssueComment.class);
Root<IssueComment> comment = commentQuery.from(IssueComment.class);
commentQuery.select(comment);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java
index 25f56efc41..27b00a16ef 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java
@@ -1,19 +1,26 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class CommentedByMeCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (User.get() != null) {
Subquery<IssueComment> commentQuery = query.subquery(IssueComment.class);
Root<IssueComment> comment = commentQuery.from(IssueComment.class);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfidentialCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfidentialCriteria.java
index 754e2ad7eb..adbf608c2d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfidentialCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfidentialCriteria.java
@@ -1,11 +1,13 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ConfidentialCriteria extends Criteria<Issue> {
@@ -13,7 +15,7 @@ public class ConfidentialCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
return builder.equal(from.get(Issue.PROP_CONFIDENTIAL), true);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java
index b2686b99e3..3ec320eaf7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ConfusedCountCriteria extends Criteria<Issue> {
@@ -23,7 +25,7 @@ public class ConfusedCountCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(Issue.PROP_CONFUSED_COUNT);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java
index d2fc28e151..bf72302ba8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CurrentIssueCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class CurrentIssueCriteria extends Criteria<Issue> {
@@ -14,7 +16,7 @@ public class CurrentIssueCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (Issue.get() != null)
return builder.equal(from, Issue.get());
else
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
index 8929238e91..13dbf4024e 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,14 +1,16 @@
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.Expression;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class DescriptionCriteria extends Criteria<Issue> {
@@ -21,7 +23,7 @@ public class DescriptionCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Expression<String> attribute = from.get(Issue.PROP_DESCRIPTION);
return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java
index ff44adc926..70efa863e8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java
@@ -1,15 +1,21 @@
package io.onedev.server.search.entity.issue;
+import static io.onedev.server.model.Issue.NAME_ESTIMATED_TIME;
+import static io.onedev.server.model.Issue.PROP_TOTAL_ESTIMATED_TIME;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
-import static io.onedev.server.model.Issue.NAME_ESTIMATED_TIME;
-import static io.onedev.server.model.Issue.PROP_TOTAL_ESTIMATED_TIME;
-
public class EstimatedTimeCriteria extends Criteria<Issue> {
@@ -25,7 +31,7 @@ public class EstimatedTimeCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Integer> estimatedTimeAttribute = from.get(PROP_TOTAL_ESTIMATED_TIME);
if (operator == IssueQueryLexer.Is)
return builder.equal(estimatedTimeAttribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java
index d4b3826c73..0be4b9dced 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class EyesCountCriteria extends Criteria<Issue> {
@@ -23,7 +25,7 @@ public class EyesCountCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(Issue.PROP_EYES_COUNT);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
index b12b4ededb..78ec20df2e 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
@@ -1,22 +1,29 @@
package io.onedev.server.search.entity.issue;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import com.google.common.base.Preconditions;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
-import org.hibernate.query.criteria.internal.predicate.NullnessPredicate;
-
-import javax.annotation.Nullable;
-import javax.persistence.criteria.*;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
public abstract class FieldCriteria extends Criteria<Issue> {
@@ -33,7 +40,7 @@ public abstract class FieldCriteria extends Criteria<Issue> {
}
@Override
- public final Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public final Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Subquery<IssueField> fieldQuery = query.subquery(IssueField.class);
Root<IssueField> fieldRoot = fieldQuery.from(IssueField.class);
fieldQuery.select(fieldRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
index f85cbfba0d..19d23cfd04 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
@@ -24,6 +24,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.criteria.Criteria;
@@ -81,7 +82,7 @@ public class FixedBetweenCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Set<Long> fixedIssueIds = new HashSet<>();
Project project = getProjectAndCommitIds().project;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java
index 196949bdb0..05ef8c50aa 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
@@ -1,17 +1,19 @@
package io.onedev.server.search.entity.issue;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Project;
-import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.util.criteria.Criteria;
+import java.util.Collection;
import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import java.util.Collection;
+
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class FixedInBuildCriteria extends Criteria<Issue> {
@@ -41,7 +43,7 @@ public class FixedInBuildCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Collection<Long> fixedIssueIds = getBuild().getFixedIssueIds();
if (!fixedIssueIds.isEmpty())
return from.get(Issue.PROP_ID).in(fixedIssueIds);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java
index 2e1c5f2dc2..5c8a4c7acc 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
@@ -9,6 +9,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.criteria.Criteria;
@@ -40,7 +41,7 @@ public class FixedInCommitCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (!getCommit().getFixedIssueIds().isEmpty())
return from.get(Issue.PROP_ID).in(getCommit().getFixedIssueIds());
else
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java
index f8100f498e..a7c30d2512 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,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -8,6 +9,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class FixedInCurrentBuildCriteria extends Criteria<Issue> {
@@ -15,9 +17,9 @@ public class FixedInCurrentBuildCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (Build.get() != null)
- return new FixedInBuildCriteria(Build.get()).getPredicate(query, from, builder);
+ return new FixedInBuildCriteria(Build.get()).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("No build in query context");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java
index b5b5dd143d..9585936528 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,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.criteria.Criteria;
@@ -15,9 +17,9 @@ public class FixedInCurrentCommitCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (ProjectScopedCommit.get() != null)
- return new FixedInCommitCriteria(ProjectScopedCommit.get()).getPredicate(query, from, builder);
+ return new FixedInCommitCriteria(ProjectScopedCommit.get()).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("No commit id in query context");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java
index cb5fb53539..06704f8599 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,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -8,6 +9,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class FixedInCurrentPullRequestCriteria extends Criteria<Issue> {
@@ -15,9 +17,9 @@ public class FixedInCurrentPullRequestCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (PullRequest.get() != null)
- return new FixedInPullRequestCriteria(PullRequest.get()).getPredicate(query, from, builder);
+ return new FixedInPullRequestCriteria(PullRequest.get()).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("No pull request in query context");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java
index 5249839e5e..41fa5db70a 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
@@ -12,6 +12,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class FixedInPullRequestCriteria extends Criteria<Issue> {
@@ -42,7 +43,7 @@ public class FixedInPullRequestCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Collection<Long> fixedIssueIds = getRequest().getFixedIssueIds();
if (!fixedIssueIds.isEmpty())
return from.get(Issue.PROP_ID).in(fixedIssueIds);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java
index dd01a955ac..6d2a599892 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FuzzyCriteria.java
@@ -1,48 +1,67 @@
package io.onedev.server.search.entity.issue;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.model.Issue;
-import io.onedev.server.util.criteria.AndCriteria;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.criteria.OrCriteria;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.Order;
import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.model.Issue;
+import io.onedev.server.search.entitytext.IssueTextManager;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class FuzzyCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
+ private static final int MAX_TEXT_QUERY_COUNT = 1000;
+
private final String value;
+
+ private transient List<Long> issueIds;
public FuzzyCriteria(String value) {
this.value = value;
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
- return parse(value).getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ if (value.length() == 0)
+ return builder.conjunction();
+ issueIds = OneDev.getInstance(IssueTextManager.class).query(projectScope, value, MAX_TEXT_QUERY_COUNT);
+ if (issueIds.isEmpty())
+ return builder.disjunction();
+ else
+ return builder.in(from.get(Issue.PROP_ID)).value(issueIds);
}
@Override
public boolean matches(Issue issue) {
- return parse(value).matches(issue);
+ if (value.length() == 0)
+ return true;
+ else
+ return OneDev.getInstance(IssueTextManager.class).matches(issue, value);
}
-
- private Criteria<Issue> parse(String value) {
- var terms = normalizeFuzzyQuery(value);
- var titleCriterias = new ArrayList<Criteria<Issue>>();
- var descriptionCriterias = new ArrayList<Criteria<Issue>>();
- var commentCriterias = new ArrayList<Criteria<Issue>>();
- for (var term: terms) {
- titleCriterias.add(new TitleCriteria(term));
- descriptionCriterias.add(new DescriptionCriteria(term));
- commentCriterias.add(new CommentCriteria(term));
+
+ @Override
+ public List<Order> getPreferOrders(CriteriaBuilder builder, From<Issue, Issue> from) {
+ if (issueIds != null && !issueIds.isEmpty()) {
+ var orders = new ArrayList<Order>();
+ var orderCase = builder.selectCase();
+ for (int i = 0; i < issueIds.size(); i++)
+ orderCase.when(builder.equal(from.get(Issue.PROP_ID), issueIds.get(i)), i);
+ orders.add(builder.asc(orderCase.otherwise(issueIds.size())));
+ return orders;
+ } else {
+ return new ArrayList<>();
}
- return new OrCriteria<>(new AndCriteria<>(titleCriterias), new AndCriteria<>(descriptionCriterias), new AndCriteria<>(commentCriterias));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
index d2f233f10b..94dcd41651 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.issue;
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -14,6 +15,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueLink;
import io.onedev.server.model.LinkSpec;
import io.onedev.server.util.LinkSide;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class HasLinkCriteria extends Criteria<Issue> {
@@ -34,7 +36,7 @@ public class HasLinkCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Subquery<IssueLink> linkQuery = query.subquery(IssueLink.class);
Root<IssueLink> linkRoot = linkQuery.from(IssueLink.class);
linkQuery.select(linkRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java
index 5424efa399..086375f977 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class HeartCountCriteria extends Criteria<Issue> {
@@ -23,7 +25,7 @@ public class HeartCountCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(Issue.PROP_HEART_COUNT);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java
index 163813b295..a27e0c0136 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -9,11 +10,12 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueSchedule;
import io.onedev.server.model.Iteration;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class IterationCriteria extends Criteria<Issue> {
@@ -29,7 +31,7 @@ public class IterationCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Subquery<IssueSchedule> scheduleQuery = query.subquery(IssueSchedule.class);
Root<IssueSchedule> schedule = scheduleQuery.from(IssueSchedule.class);
scheduleQuery.select(schedule);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationEmptyCriteria.java
index 3e631af775..aeafc0a9c3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationEmptyCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueSchedule;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class IterationEmptyCriteria extends Criteria<Issue> {
@@ -20,7 +22,7 @@ public class IterationEmptyCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
var predicate = builder.isEmpty(from.get(Issue.PROP_SCHEDULES));
if (operator == IssueQueryLexer.IsNotEmpty)
predicate = builder.not(predicate);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java
index 6c6f222587..f24b9a00fc 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.issue;
import java.util.Date;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -12,6 +13,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class LastActivityDateCriteria extends Criteria<Issue> {
@@ -37,7 +39,7 @@ public class LastActivityDateCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Date> attribute = IssueQuery.getPath(from, Issue.PROP_LAST_ACTIVITY + "." + LastActivity.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/LinkMatchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
index 04735aa518..76335f4632 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
@@ -9,6 +9,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -26,6 +27,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueLink;
import io.onedev.server.model.LinkSpec;
import io.onedev.server.util.LinkSide;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
@@ -51,7 +53,7 @@ public class LinkMatchCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Subquery<IssueLink> linkQuery = query.subquery(IssueLink.class);
Root<IssueLink> linkRoot = linkQuery.from(IssueLink.class);
linkQuery.select(linkRoot);
@@ -66,46 +68,46 @@ public class LinkMatchCriteria extends Criteria<Issue> {
if (opposite) {
predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_TARGET), from));
Join<Issue, Issue> linkSourceJoin = linkRoot.join(IssueLink.PROP_SOURCE, JoinType.INNER);
- predicates.add(builder.not(criteria.getPredicate(query, linkSourceJoin, builder)));
+ predicates.add(builder.not(criteria.getPredicate(projectScope, query, linkSourceJoin, builder)));
} else if (spec.getOpposite() != null) {
predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_SOURCE), from));
Join<Issue, Issue> linkTargetJoin = linkRoot.join(IssueLink.PROP_TARGET, JoinType.INNER);
- predicates.add(builder.not(criteria.getPredicate(query, linkTargetJoin, builder)));
+ predicates.add(builder.not(criteria.getPredicate(projectScope, query, linkTargetJoin, builder)));
} else {
Join<Issue, Issue> linkSourceJoin = linkRoot.join(IssueLink.PROP_SOURCE, JoinType.INNER);
Join<Issue, Issue> linkTargetJoin = linkRoot.join(IssueLink.PROP_TARGET, JoinType.INNER);
predicates.add(builder.or(
builder.and(
builder.equal(linkRoot.get(IssueLink.PROP_SOURCE), from),
- builder.not(criteria.getPredicate(query, linkTargetJoin, builder))),
+ builder.not(criteria.getPredicate(projectScope, query, linkTargetJoin, builder))),
builder.and(
builder.equal(linkRoot.get(IssueLink.PROP_TARGET), from),
- builder.not(criteria.getPredicate(query, linkSourceJoin, builder)))
+ builder.not(criteria.getPredicate(projectScope, query, linkSourceJoin, builder)))
));
}
return builder.and(
builder.not(builder.exists(linkQuery.where(builder.and(predicates.toArray(new Predicate[0]))))),
- new HasLinkCriteria(getLinkSide()).getPredicate(query, from, builder));
+ new HasLinkCriteria(getLinkSide()).getPredicate(projectScope, query, from, builder));
} else {
if (opposite) {
predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_TARGET), from));
Join<Issue, Issue> linkSourceJoin = linkRoot.join(IssueLink.PROP_SOURCE, JoinType.INNER);
- predicates.add(criteria.getPredicate(query, linkSourceJoin, builder));
+ predicates.add(criteria.getPredicate(projectScope, query, linkSourceJoin, builder));
} else if (spec.getOpposite() != null) {
predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_SOURCE), from));
Join<Issue, Issue> linkTargetJoin = linkRoot.join(IssueLink.PROP_TARGET, JoinType.INNER);
- predicates.add(criteria.getPredicate(query, linkTargetJoin, builder));
+ predicates.add(criteria.getPredicate(projectScope, query, linkTargetJoin, builder));
} else {
Join<Issue, Issue> linkSourceJoin = linkRoot.join(IssueLink.PROP_SOURCE, JoinType.INNER);
Join<Issue, Issue> linkTargetJoin = linkRoot.join(IssueLink.PROP_TARGET, JoinType.INNER);
predicates.add(builder.or(
builder.and(
builder.equal(linkRoot.get(IssueLink.PROP_SOURCE), from),
- criteria.getPredicate(query, linkTargetJoin, builder)),
+ criteria.getPredicate(projectScope, query, linkTargetJoin, builder)),
builder.and(
builder.equal(linkRoot.get(IssueLink.PROP_TARGET), from),
- criteria.getPredicate(query, linkSourceJoin, builder))
+ criteria.getPredicate(projectScope, query, linkSourceJoin, builder))
));
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedCriteria.java
index 4387bc684b..9a6bedde0c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedCriteria.java
@@ -1,12 +1,19 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueMention;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class MentionedCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@@ -18,7 +25,7 @@ public class MentionedCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Subquery<IssueMention> mentionQuery = query.subquery(IssueMention.class);
Root<IssueMention> mention = mentionQuery.from(IssueMention.class);
mentionQuery.select(mention);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java
index 8df16fc868..ad52fbd20b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java
@@ -1,19 +1,26 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueMention;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class MentionedMeCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (User.get() != null) {
Subquery<IssueMention> mentionQuery = query.subquery(IssueMention.class);
Root<IssueMention> mention = mentionQuery.from(IssueMention.class);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProgressCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProgressCriteria.java
index e3d3e37165..638ee3cffd 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProgressCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProgressCriteria.java
@@ -1,11 +1,18 @@
package io.onedev.server.search.entity.issue;
-import io.onedev.server.model.Issue;
-import io.onedev.server.util.criteria.Criteria;
+import static io.onedev.server.model.Issue.NAME_PROGRESS;
+import static io.onedev.server.model.Issue.PROP_PROGRESS;
-import javax.persistence.criteria.*;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
-import static io.onedev.server.model.Issue.*;
+import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class ProgressCriteria extends Criteria<Issue> {
@@ -22,7 +29,7 @@ public class ProgressCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Integer> progressAttribute = from.get(PROP_PROGRESS);
Predicate ratePredicate;
int intValue = (int)(value*100);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java
index f5c333a221..7a2f538aef 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,13 +1,19 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
-
-import javax.persistence.criteria.*;
public class ProjectCriteria extends Criteria<Issue> {
@@ -23,7 +29,7 @@ public class ProjectCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
var predicate = OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(
builder, from.join(Issue.PROP_PROJECT, JoinType.INNER), projectPath);
if (operator == IssueQueryLexer.IsNot)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectIsCurrentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectIsCurrentCriteria.java
index 38aa6e777d..be7f238317 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectIsCurrentCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectIsCurrentCriteria.java
@@ -1,18 +1,24 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class ProjectIsCurrentCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (Project.get() != null)
return builder.equal(from.join(Issue.PROP_PROJECT, JoinType.INNER), Project.get());
else
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceCriteria.java
index 1df291190e..274b6cef17 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ReferenceCriteria.java
@@ -1,13 +1,18 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.entityreference.IssueReference;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.annotation.Nullable;
-import javax.persistence.criteria.*;
-
public class ReferenceCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@@ -25,7 +30,7 @@ public class ReferenceCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Long> attribute = from.get(Issue.PROP_NUMBER);
Predicate numberPredicate;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java
index 05175efb77..0b536a10db 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class RocketCountCriteria extends Criteria<Issue> {
@@ -23,7 +25,7 @@ public class RocketCountCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(Issue.PROP_ROCKET_COUNT);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java
index 787e8d63ec..b1702cff90 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class SmileCountCriteria extends Criteria<Issue> {
@@ -23,7 +25,7 @@ public class SmileCountCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(Issue.PROP_SMILE_COUNT);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java
index 3b20d87512..935947e0cc 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java
@@ -1,15 +1,21 @@
package io.onedev.server.search.entity.issue;
+import static io.onedev.server.model.Issue.NAME_SPENT_TIME;
+import static io.onedev.server.model.Issue.PROP_TOTAL_SPENT_TIME;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
-import static io.onedev.server.model.Issue.NAME_SPENT_TIME;
-import static io.onedev.server.model.Issue.PROP_TOTAL_SPENT_TIME;
-
public class SpentTimeCriteria extends Criteria<Issue> {
@@ -25,7 +31,7 @@ public class SpentTimeCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Integer> spentTimeAttribute = from.get(PROP_TOTAL_SPENT_TIME);
if (operator == IssueQueryLexer.Is)
return builder.equal(spentTimeAttribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
index 6cd522d6cc..d94eec2979 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
@@ -1,21 +1,24 @@
package io.onedev.server.search.entity.issue;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
public class StateCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@@ -32,7 +35,7 @@ public class StateCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (operator == IssueQueryLexer.IsBefore)
return builder.lt(from.get(Issue.PROP_STATE_ORDINAL), getOrdinal());
else if (operator == IssueQueryLexer.IsAfter)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
index 6715088c0d..4c725d4929 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.issue;
import java.util.Date;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class SubmitDateCriteria extends Criteria<Issue> {
@@ -29,7 +31,7 @@ public class SubmitDateCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Date> attribute = from.get(Issue.PROP_SUBMIT_DATE);
if (operator == IssueQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
index ab29289e10..71a567f8f7 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.issue;
import java.util.Objects;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class SubmittedByCriteria extends Criteria<Issue> {
@@ -23,7 +25,7 @@ public class SubmittedByCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<User> attribute = from.get(Issue.PROP_SUBMITTER);
return builder.equal(attribute, user);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
index 79500085a9..8a485b478c 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,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -9,6 +10,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class SubmittedByMeCriteria extends Criteria<Issue> {
@@ -16,7 +18,7 @@ public class SubmittedByMeCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (User.get() != null) {
Path<User> attribute = from.get(Issue.PROP_SUBMITTER);
return builder.equal(attribute, User.get());
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java
index 57d98b716f..88ea616852 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class TadaCountCriteria extends Criteria<Issue> {
@@ -23,7 +25,7 @@ public class TadaCountCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(Issue.PROP_TADA_COUNT);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java
index a12d84fe86..304b72f0a4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ThumbsDownCountCriteria extends Criteria<Issue> {
@@ -23,7 +25,7 @@ public class ThumbsDownCountCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(Issue.PROP_THUMBS_DOWN_COUNT);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java
index 6e7f91d092..4500c78854 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ThumbsUpCountCriteria extends Criteria<Issue> {
@@ -23,7 +25,7 @@ public class ThumbsUpCountCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(Issue.PROP_THUMBS_UP_COUNT);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
index 2b6718661e..6b1736e68b 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,14 +1,16 @@
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.Expression;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class TitleCriteria extends Criteria<Issue> {
@@ -21,7 +23,7 @@ public class TitleCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Expression<String> attribute = from.get(Issue.PROP_TITLE);
return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
index 48a5be19c7..0cefac36fd 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,5 +1,6 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class VoteCountCriteria extends Criteria<Issue> {
@@ -23,7 +25,7 @@ public class VoteCountCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(Issue.PROP_VOTE_COUNT);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByCriteria.java
index 12b882a546..61e0c5c3a2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByCriteria.java
@@ -1,12 +1,19 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueWatch;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class WatchedByCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@@ -18,7 +25,7 @@ public class WatchedByCriteria extends Criteria<Issue> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Subquery<IssueWatch> watchQuery = query.subquery(IssueWatch.class);
Root<IssueWatch> watch = watchQuery.from(IssueWatch.class);
watchQuery.select(watch);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java
index 97d33dc734..de54368ac3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java
@@ -1,19 +1,26 @@
package io.onedev.server.search.entity.issue;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueWatch;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class WatchedByMeCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (User.get() != null) {
Subquery<IssueWatch> watchQuery = query.subquery(IssueWatch.class);
Root<IssueWatch> watch = watchQuery.from(IssueWatch.class);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/FuzzyCriteria.java
index da4ef9e345..ee7002294e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/FuzzyCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pack;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.model.Pack;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.criteria.OrCriteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.model.Pack;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.util.criteria.OrCriteria;
+
public class FuzzyCriteria extends Criteria<Pack> {
private static final long serialVersionUID = 1L;
@@ -21,8 +23,8 @@ public class FuzzyCriteria extends Criteria<Pack> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
- return parse(value).getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
+ return parse(value).getPredicate(projectScope, query, from, builder);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java
index 160c997865..ecfb62813d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pack;
-import io.onedev.server.model.LabelSpec;
-import io.onedev.server.model.Pack;
-import io.onedev.server.model.PackLabel;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.model.LabelSpec;
+import io.onedev.server.model.Pack;
+import io.onedev.server.model.PackLabel;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class LabelCriteria extends Criteria<Pack> {
private static final long serialVersionUID = 1L;
@@ -24,7 +26,7 @@ public class LabelCriteria extends Criteria<Pack> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
var labelQuery = query.subquery(PackLabel.class);
var labelRoot = labelQuery.from(PackLabel.class);
labelQuery.select(labelRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java
index 1c52b3a063..e3bb8428ea 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java
@@ -1,11 +1,17 @@
package io.onedev.server.search.entity.pack;
-import io.onedev.server.model.Pack;
-import io.onedev.server.util.criteria.Criteria;
+import static io.onedev.commons.utils.match.WildcardUtils.matchString;
-import javax.persistence.criteria.*;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
-import static io.onedev.commons.utils.match.WildcardUtils.matchString;
+import io.onedev.server.model.Pack;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class NameCriteria extends Criteria<Pack> {
@@ -21,7 +27,7 @@ public class NameCriteria extends Criteria<Pack> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Pack.PROP_NAME);
String normalized = value.toLowerCase().replace("*", "%");
var predicate = builder.like(builder.lower(attribute), normalized);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java
index a6cb5e24a3..d4da14d15c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java
@@ -1,12 +1,18 @@
package io.onedev.server.search.entity.pack;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Pack;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
-
-import javax.persistence.criteria.*;
public class ProjectCriteria extends Criteria<Pack> {
@@ -22,7 +28,7 @@ public class ProjectCriteria extends Criteria<Pack> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
var predicate = OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(
builder, from.join(Pack.PROP_PROJECT, JoinType.INNER), projectPath);
if (operator == PackQueryLexer.IsNot)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java
index c40fea4063..8e2caf533d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java
@@ -1,12 +1,19 @@
package io.onedev.server.search.entity.pack;
+import java.util.Date;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.model.Pack;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-import java.util.Date;
-
public class PublishDateCriteria extends Criteria<Pack> {
private static final long serialVersionUID = 1L;
@@ -24,7 +31,7 @@ public class PublishDateCriteria extends Criteria<Pack> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
Path<Date> attribute = from.get(Pack.PROP_PUBLISH_DATE);
if (operator == PackQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByBuildCriteria.java
index 4575cc2766..2887533fb5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByBuildCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByBuildCriteria.java
@@ -1,14 +1,19 @@
package io.onedev.server.search.entity.pack;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.model.Build;
import io.onedev.server.model.Pack;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.annotation.Nullable;
-import javax.persistence.criteria.*;
-
public class PublishedByBuildCriteria extends Criteria<Pack> {
private static final long serialVersionUID = 1L;
@@ -28,7 +33,7 @@ public class PublishedByBuildCriteria extends Criteria<Pack> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
Path<Build> attribute = from.get(Pack.PROP_BUILD);
return builder.equal(attribute, build);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java
index bc83806326..9a9dfb079e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java
@@ -1,18 +1,24 @@
package io.onedev.server.search.entity.pack;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Pack;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class PublishedByMeCriteria extends Criteria<Pack> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
if (User.get() != null) {
Path<User> attribute = from.get(Pack.PROP_USER);
return builder.equal(attribute, User.get());
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByProjectCriteria.java
index a91b5fa27f..8a269d92ac 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByProjectCriteria.java
@@ -1,13 +1,19 @@
package io.onedev.server.search.entity.pack;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Pack;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
-
-import javax.persistence.criteria.*;
public class PublishedByProjectCriteria extends Criteria<Pack> {
@@ -20,7 +26,7 @@ public class PublishedByProjectCriteria extends Criteria<Pack> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(
builder, from.join(Pack.PROP_BUILD, JoinType.INNER).join(Build.PROP_PROJECT, JoinType.INNER), projectPath);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java
index 822d30574e..42b550805a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java
@@ -1,12 +1,19 @@
package io.onedev.server.search.entity.pack;
+import java.util.Objects;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.model.Pack;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-import java.util.Objects;
-
public class PublishedByUserCriteria extends Criteria<Pack> {
private static final long serialVersionUID = 1L;
@@ -18,7 +25,7 @@ public class PublishedByUserCriteria extends Criteria<Pack> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
Path<User> attribute = from.get(Pack.PROP_USER);
return builder.equal(attribute, user);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java
index 2292450ed5..d47bf77e23 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java
@@ -1,13 +1,15 @@
package io.onedev.server.search.entity.pack;
-import io.onedev.server.model.Pack;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.model.Pack;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class TypeCriteria extends Criteria<Pack> {
private static final long serialVersionUID = 1L;
@@ -22,7 +24,7 @@ public class TypeCriteria extends Criteria<Pack> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
var predicate = builder.equal(from.get(Pack.PROP_TYPE), value);
if (operator == PackQueryLexer.IsNot)
predicate = builder.not(predicate);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java
index c9ce566ffb..213d0e5fd7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java
@@ -1,11 +1,17 @@
package io.onedev.server.search.entity.pack;
-import io.onedev.server.model.Pack;
-import io.onedev.server.util.criteria.Criteria;
+import static io.onedev.commons.utils.match.WildcardUtils.matchString;
-import javax.persistence.criteria.*;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
-import static io.onedev.commons.utils.match.WildcardUtils.matchString;
+import io.onedev.server.model.Pack;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class VersionCriteria extends Criteria<Pack> {
@@ -21,7 +27,7 @@ public class VersionCriteria extends Criteria<Pack> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Pack.PROP_VERSION);
String normalized = value.toLowerCase().replace("*", "%");
var predicate = builder.like(builder.lower(attribute), normalized);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java
index 59a88b5158..d45583ac8a 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,5 +1,6 @@
package io.onedev.server.search.entity.project;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,11 +8,12 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class ChildrenOfCriteria extends Criteria<Project> {
@@ -24,7 +26,7 @@ public class ChildrenOfCriteria extends Criteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Subquery<Project> parentQuery = query.subquery(Project.class);
Root<Project> parentRoot = parentQuery.from(Project.class);
parentQuery.select(parentRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/CommitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/CommitDateCriteria.java
index 09e47f7820..0ae47bd74a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/CommitDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/CommitDateCriteria.java
@@ -1,13 +1,20 @@
package io.onedev.server.search.entity.project;
+import java.util.Date;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.model.Project;
import io.onedev.server.model.ProjectLastEventDate;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-import java.util.Date;
-
public class CommitDateCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
@@ -25,7 +32,7 @@ public class CommitDateCriteria extends Criteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Path<Date> attribute = ProjectQuery.getPath(from, Project.PROP_LAST_EVENT_DATE + "." + ProjectLastEventDate.PROP_COMMIT);
if (operator == ProjectQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java
index 7e689abf80..71f13d6be8 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,14 +1,16 @@
package io.onedev.server.search.entity.project;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class DescriptionCriteria extends Criteria<Project> {
@@ -21,7 +23,7 @@ public class DescriptionCriteria extends Criteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Expression<String> attribute = from.get(Project.PROP_DESCRIPTION);
return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForkRootsCriteria.java
index 07a1c8991d..d23c9c5b43 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,11 +1,13 @@
package io.onedev.server.search.entity.project;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ForkRootsCriteria extends Criteria<Project> {
@@ -13,7 +15,7 @@ public class ForkRootsCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
return builder.isNull(from.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.java
index 0cded73921..205d59f9fc 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,5 +1,6 @@
package io.onedev.server.search.entity.project;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,11 +8,12 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class ForksOfCriteria extends Criteria<Project> {
@@ -24,7 +26,7 @@ public class ForksOfCriteria extends Criteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Subquery<Project> forkedFromQuery = query.subquery(Project.class);
Root<Project> forkedFromRoot = forkedFromQuery.from(Project.class);
forkedFromQuery.select(forkedFromRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java
index be25788737..0dbb1a5d9d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java
@@ -1,18 +1,22 @@
package io.onedev.server.search.entity.project;
-import com.google.common.base.Splitter;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.model.Project;
-import io.onedev.server.util.criteria.AndCriteria;
-import io.onedev.server.util.criteria.Criteria;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.Is;
+
+import java.util.ArrayList;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
-import static io.onedev.server.search.entity.project.ProjectQueryLexer.Is;
+import com.google.common.base.Splitter;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.AndCriteria;
+import io.onedev.server.util.criteria.Criteria;
public class FuzzyCriteria extends Criteria<Project> {
@@ -25,8 +29,8 @@ public class FuzzyCriteria extends Criteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
- return parse(value).getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ return parse(value).getPredicate(projectScope, query, from, builder);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java
index 0f87fd54cf..7d5e74874c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java
@@ -1,21 +1,23 @@
package io.onedev.server.search.entity.project;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class HasOutdatedReplicasCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
return forManyValues(builder, from.get(Project.PROP_ID),
projectManager.getIdsHasOutdatedReplicas(), projectManager.getIds());
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/IdCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/IdCriteria.java
index 14b4007acd..88d11aa094 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/IdCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/IdCriteria.java
@@ -1,13 +1,15 @@
package io.onedev.server.search.entity.project;
-import io.onedev.server.model.Project;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class IdCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
@@ -22,7 +24,7 @@ public class IdCriteria extends Criteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
if (operator == ProjectQueryLexer.Is)
return builder.equal(from.get(Project.PROP_ID), value);
else
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/KeyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/KeyCriteria.java
index 8928671eaf..206de7bf76 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/KeyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/KeyCriteria.java
@@ -1,11 +1,17 @@
package io.onedev.server.search.entity.project;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class KeyCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
@@ -20,7 +26,7 @@ public class KeyCriteria extends Criteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Project.PROP_KEY);
var predicate = builder.like(attribute, value.replace("*", "%"));
if (operator == ProjectQueryLexer.IsNot)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java
index 785acc1fc6..efc6e899fc 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java
@@ -1,14 +1,15 @@
package io.onedev.server.search.entity.project;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import com.hazelcast.internal.monitor.impl.GlobalPerIndexStats;
import io.onedev.server.model.LabelSpec;
import io.onedev.server.model.Project;
import io.onedev.server.model.ProjectLabel;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class LabelCriteria extends Criteria<Project> {
@@ -25,7 +26,7 @@ public class LabelCriteria extends Criteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
var labelQuery = query.subquery(ProjectLabel.class);
var labelRoot = labelQuery.from(ProjectLabel.class);
labelQuery.select(labelRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java
index d46061abda..5f4458ab26 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.project;
import java.util.Date;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -11,6 +12,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.ProjectLastEventDate;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class LastActivityDateCriteria extends Criteria<Project> {
@@ -30,7 +32,7 @@ public class LastActivityDateCriteria extends Criteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Path<Date> attribute = ProjectQuery.getPath(from, Project.PROP_LAST_EVENT_DATE + "." + ProjectLastEventDate.PROP_ACTIVITY);
if (operator == ProjectQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java
index 172135969f..27d17b8568 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.project;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -8,6 +9,7 @@ import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class LeafsCriteria extends Criteria<Project> {
@@ -15,7 +17,7 @@ public class LeafsCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Subquery<Project> childrenQuery = query.subquery(Project.class);
Root<Project> childrenRoot = childrenQuery.from(Project.class);
childrenQuery.select(childrenRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java
index 96499eb4fa..7da1cd6fe0 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java
@@ -1,21 +1,23 @@
package io.onedev.server.search.entity.project;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class MissingStorageCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
return forManyValues(builder, from.get(Project.PROP_ID),
projectManager.getIdsMissingStorage(), projectManager.getIds());
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
index cf904fce39..8ba5e9d3e0 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,14 +1,16 @@
package io.onedev.server.search.entity.project;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class NameCriteria extends Criteria<Project> {
@@ -24,7 +26,7 @@ public class NameCriteria extends Criteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Project.PROP_NAME);
var predicate = builder.like(builder.lower(attribute), value.toLowerCase().replace("*", "%"));
if (operator == ProjectQueryLexer.IsNot)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java
index 99949b3876..3ae1a830fa 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,5 +1,6 @@
package io.onedev.server.search.entity.project;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -12,6 +13,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.Role;
import io.onedev.server.model.User;
import io.onedev.server.model.UserAuthorization;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class OwnedByCriteria extends Criteria<Project> {
@@ -25,7 +27,7 @@ public class OwnedByCriteria extends Criteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Join<?, ?> userAuthorizationJoin = from.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.java
index f9ddf55498..10dd0409f9 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,5 +1,6 @@
package io.onedev.server.search.entity.project;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -8,6 +9,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class OwnedByMeCriteria extends Criteria<Project> {
@@ -15,9 +17,9 @@ public class OwnedByMeCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
if (User.get() != null)
- return new OwnedByCriteria(User.get()).getPredicate(query, from, builder);
+ return new OwnedByCriteria(User.get()).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("Please login to perform this query");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByNoneCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByNoneCriteria.java
index 6431ee1b7c..464f05bf86 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,5 +1,6 @@
package io.onedev.server.search.entity.project;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -11,6 +12,7 @@ import io.onedev.server.model.GroupAuthorization;
import io.onedev.server.model.Project;
import io.onedev.server.model.Role;
import io.onedev.server.model.UserAuthorization;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class OwnedByNoneCriteria extends Criteria<Project> {
@@ -18,7 +20,7 @@ public class OwnedByNoneCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Join<?, ?> userAuthorizationJoin = from.join(Project.PROP_USER_AUTHORIZATIONS, JoinType.LEFT);
Join<?, ?> groupAuthorizationJoin = from.join(Project.PROP_GROUP_AUTHORIZATIONS, JoinType.LEFT);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java
index 5b0f21d609..c6abbf1e78 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,12 +1,17 @@
package io.onedev.server.search.entity.project;
-import javax.persistence.criteria.*;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class PathCriteria extends Criteria<Project> {
@@ -22,7 +27,7 @@ public class PathCriteria extends Criteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
var predicate = OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder, from, value);
if (operator == ProjectQueryLexer.IsNot)
predicate = builder.not(predicate);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/PendingDeleteCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/PendingDeleteCriteria.java
index de51803836..1b8ad572bc 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/PendingDeleteCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/PendingDeleteCriteria.java
@@ -1,18 +1,22 @@
package io.onedev.server.search.entity.project;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class PendingDeleteCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Project.PROP_PENDING_DELETE);
return builder.equal(attribute, true);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/RootsCriteria.java
index 4aedbe7d89..52ece313f0 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,11 +1,13 @@
package io.onedev.server.search.entity.project;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class RootsCriteria extends Criteria<Project> {
@@ -13,7 +15,7 @@ public class RootsCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
return builder.isNull(from.get(Project.PROP_PARENT));
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskEmailAddressCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskEmailAddressCriteria.java
index 0c7b1ac69c..0e9ffcf27d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskEmailAddressCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskEmailAddressCriteria.java
@@ -1,11 +1,17 @@
package io.onedev.server.search.entity.project;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class ServiceDeskEmailAddressCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
@@ -20,7 +26,7 @@ public class ServiceDeskEmailAddressCriteria extends Criteria<Project> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Project.PROP_SERVICE_DESK_EMAIL_ADDRESS);
var predicate = builder.like(builder.lower(attribute), value.toLowerCase().replace("*", "%"));
if (operator == ProjectQueryLexer.IsNot)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java
index 721e4893ae..4126d34609 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java
@@ -1,21 +1,23 @@
package io.onedev.server.search.entity.project;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class WithoutEnoughReplicasCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
return forManyValues(builder, from.get(Project.PROP_ID),
projectManager.getIdsWithoutEnoughReplicas(), projectManager.getIds());
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
index c545f6006c..f2051657bb 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,13 +1,20 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.PullRequestReview.Status;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class ApprovedByCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -19,7 +26,7 @@ public class ApprovedByCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Subquery<PullRequestReview> reviewQuery = query.subquery(PullRequestReview.class);
Root<PullRequestReview> review = reviewQuery.from(PullRequestReview.class);
reviewQuery.select(review);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
index a165609226..e591589ac7 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,24 +1,26 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class ApprovedByMeCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var user = User.get();
if (user != null)
- return getCriteria(user).getPredicate(query, from, builder);
+ return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("Please login to perform this query");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java
index 01a49dc111..1af20758ca 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,12 +1,19 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestAssignment;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class AssignedToCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -18,7 +25,7 @@ public class AssignedToCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Subquery<PullRequestAssignment> assignmentQuery = query.subquery(PullRequestAssignment.class);
Root<PullRequestAssignment> assignment = assignmentQuery.from(PullRequestAssignment.class);
assignmentQuery.select(assignment);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
index 6ffc3df1ce..ecd658eb5b 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,24 +1,26 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class AssignedToMeCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var user = User.get();
if (user != null)
- return getCriteria(user).getPredicate(query, from, builder);
+ return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("Please login to perform this query");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
index 3ee7b207c4..06a96ff4cb 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
@@ -1,12 +1,19 @@
package io.onedev.server.search.entity.pullrequest;
+import java.util.Date;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-import java.util.Date;
-
public class CloseDateCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -24,7 +31,7 @@ public class CloseDateCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Date> attribute = from.get(PullRequest.PROP_CLOSE_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.java
index e89d647551..65c8c9ca6c 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,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class CommentCountCriteria extends Criteria<PullRequest> {
@@ -23,7 +25,7 @@ public class CommentCountCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Long> attribute = from.get(PullRequest.PROP_COMMENT_COUNT);
if (operator == PullRequestQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
index 9c6f3fded5..f502d40bb5 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,14 +1,22 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.util.criteria.Criteria;
+import static io.onedev.commons.utils.match.WildcardUtils.matchString;
-import javax.persistence.criteria.*;
import java.util.ArrayList;
import java.util.List;
-import static io.onedev.commons.utils.match.WildcardUtils.matchString;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class CommentCriteria extends Criteria<PullRequest> {
@@ -21,7 +29,7 @@ public class CommentCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Subquery<PullRequestComment> commentQuery = query.subquery(PullRequestComment.class);
Root<PullRequestComment> commentRoot = commentQuery.from(PullRequestComment.class);
commentQuery.select(commentRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByCriteria.java
index aa18ffe088..704d1321cc 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByCriteria.java
@@ -1,12 +1,19 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class CommentedByCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -18,7 +25,7 @@ public class CommentedByCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Subquery<PullRequestComment> commentQuery = query.subquery(PullRequestComment.class);
Root<PullRequestComment> comment = commentQuery.from(PullRequestComment.class);
commentQuery.select(comment);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java
index 47f2be7d9f..8a7e65ef12 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java
@@ -1,24 +1,26 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class CommentedByMeCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var user = User.get();
if (user != null)
- return getCriteria(user).getPredicate(query, from, builder);
+ return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("Please login to perform this query");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java
index a6d0d0d3ca..218c9deff8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ConfusedCountCriteria extends Criteria<PullRequest> {
@@ -23,7 +25,7 @@ public class ConfusedCountCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(PullRequest.PROP_CONFUSED_COUNT);
if (operator == PullRequestQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
index 6e665197b5..95da0f468e 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,14 +1,16 @@
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.Expression;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class DescriptionCriteria extends Criteria<PullRequest> {
@@ -21,7 +23,7 @@ public class DescriptionCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Expression<String> attribute = from.get(PullRequest.PROP_DESCRIPTION);
return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
index 5fac5732a9..b0b9668bc5 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,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequest.Status;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class DiscardedCriteria extends Criteria<PullRequest> {
@@ -18,8 +20,8 @@ public class DiscardedCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- return getCriteria().getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ return getCriteria().getPredicate(projectScope, query, from, builder);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java
index 2c8dcf8ecb..a91fab091d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class EyesCountCriteria extends Criteria<PullRequest> {
@@ -23,7 +25,7 @@ public class EyesCountCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(PullRequest.PROP_EYES_COUNT);
if (operator == PullRequestQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java
index 456173b808..ce95305721 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/FuzzyCriteria.java
@@ -1,49 +1,69 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.util.criteria.AndCriteria;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.criteria.OrCriteria;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.Order;
import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.search.entitytext.PullRequestTextManager;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
public class FuzzyCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
+ private static final int MAX_TEXT_QUERY_COUNT = 1000;
+
private final String value;
+
+ private transient List<Long> requestIds;
public FuzzyCriteria(String value) {
this.value = value;
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- return parse(value).getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ if (value.length() == 0)
+ return builder.conjunction();
+ var project = projectScope!=null? projectScope.getProject(): null;
+ requestIds = OneDev.getInstance(PullRequestTextManager.class).query(project, value, MAX_TEXT_QUERY_COUNT);
+ if (requestIds.isEmpty())
+ return builder.disjunction();
+ else
+ return builder.in(from.get(PullRequest.PROP_ID)).value(requestIds);
}
@Override
public boolean matches(PullRequest request) {
- return parse(value).matches(request);
+ if (value.length() == 0)
+ return true;
+ else
+ return OneDev.getInstance(PullRequestTextManager.class).matches(request, value);
}
-
- private Criteria<PullRequest> parse(String value) {
- var terms = normalizeFuzzyQuery(value);
- var titleCriterias = new ArrayList<Criteria<PullRequest>>();
- var descriptionCriterias = new ArrayList<Criteria<PullRequest>>();
- var commentCriterias = new ArrayList<Criteria<PullRequest>>();
- for (var term: terms) {
- titleCriterias.add(new TitleCriteria(term));
- descriptionCriterias.add(new DescriptionCriteria(term));
- commentCriterias.add(new CommentCriteria(term));
+
+ @Override
+ public List<Order> getPreferOrders(CriteriaBuilder builder, From<PullRequest, PullRequest> from) {
+ if (requestIds != null && !requestIds.isEmpty()) {
+ var orders = new ArrayList<Order>();
+ var orderCase = builder.selectCase();
+ for (int i = 0; i < requestIds.size(); i++)
+ orderCase.when(builder.equal(from.get(PullRequest.PROP_ID), requestIds.get(i)), i);
+ orders.add(builder.asc(orderCase.otherwise(requestIds.size())));
+ return orders;
+ } else {
+ return new ArrayList<>();
}
- return new OrCriteria<>(new AndCriteria<>(titleCriterias), new AndCriteria<>(descriptionCriterias), new AndCriteria<>(commentCriterias));
- }
+ }
@Override
public String toStringWithoutParens() {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
index eb3f57a168..2017a90a27 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,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -8,6 +9,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergePreview;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class HasMergeConflictsCriteria extends Criteria<PullRequest> {
@@ -15,7 +17,7 @@ public class HasMergeConflictsCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<?> requestHead = PullRequestQuery.getPath(from, PullRequest.PROP_MERGE_PREVIEW + "." + MergePreview.PROP_HEAD_COMMIT_HASH);
Path<?> merged = PullRequestQuery.getPath(from, PullRequest.PROP_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.java
index c4ef44f419..0f07b01927 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,11 +1,17 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.persistence.criteria.*;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.PullRequestReview.Status;
-import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class HasPendingReviewsCriteria extends Criteria<PullRequest> {
@@ -13,7 +19,7 @@ public class HasPendingReviewsCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Subquery<PullRequestReview> reviewQuery = query.subquery(PullRequestReview.class);
Root<PullRequestReview> review = reviewQuery.from(PullRequestReview.class);
reviewQuery.select(review);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.java
index d105464fa5..d94da6d423 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.java
@@ -1,17 +1,24 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.Build;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class HasUnfinishedBuildsCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Subquery<Build> buildQuery = query.subquery(Build.class);
Root<Build> build = buildQuery.from(Build.class);
buildQuery.select(build);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnsuccessfulBuilds.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnsuccessfulBuilds.java
index 47fb1a7663..eb1898afbb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnsuccessfulBuilds.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnsuccessfulBuilds.java
@@ -1,17 +1,24 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.Build;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class HasUnsuccessfulBuilds extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Subquery<Build> buildQuery = query.subquery(Build.class);
Root<Build> build = buildQuery.from(Build.class);
buildQuery.select(build);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java
index 083f8d5114..dfa158e299 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class HeartCountCriteria extends Criteria<PullRequest> {
@@ -23,7 +25,7 @@ public class HeartCountCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(PullRequest.PROP_HEART_COUNT);
if (operator == PullRequestQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
index 6197b80ba9..86f8563f60 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
@@ -11,12 +11,13 @@ import javax.persistence.criteria.Predicate;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
-import io.onedev.server.xodus.PullRequestInfoManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.xodus.PullRequestInfoManager;
public class IncludesCommitCriteria extends Criteria<PullRequest> {
@@ -36,7 +37,7 @@ public class IncludesCommitCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Collection<Long> pullRequestIds = getPullRequestIds();
if (!pullRequestIds.isEmpty())
return from.get(PullRequest.PROP_ID).in(pullRequestIds);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
index 2b59c2bce3..abba36f000 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
@@ -12,13 +12,14 @@ import javax.persistence.criteria.Predicate;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
-import io.onedev.server.xodus.CommitInfoManager;
-import io.onedev.server.xodus.PullRequestInfoManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.xodus.CommitInfoManager;
+import io.onedev.server.xodus.PullRequestInfoManager;
public class IncludesIssueCriteria extends Criteria<PullRequest> {
@@ -39,7 +40,7 @@ public class IncludesIssueCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from,
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from,
CriteriaBuilder builder) {
Collection<Long> pullRequestIds = new HashSet<>();
issue.getProject().getTree().stream().filter(it->it.isCodeManagement()).forEach(it-> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java
index d737a47625..847040bfdc 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -8,6 +9,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.LabelSpec;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestLabel;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class LabelCriteria extends Criteria<PullRequest> {
@@ -24,7 +26,7 @@ public class LabelCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var labelQuery = query.subquery(PullRequestLabel.class);
var labelRoot = labelQuery.from(PullRequestLabel.class);
labelQuery.select(labelRoot);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java
index d530ca4752..ba552a53db 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Date;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -11,6 +12,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class LastActivityDateCriteria extends Criteria<PullRequest> {
@@ -30,7 +32,7 @@ public class LastActivityDateCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Date> attribute = PullRequestQuery.getPath(from, PullRequest.PROP_LAST_ACTIVITY + "." + LastActivity.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/MentionedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedCriteria.java
index b0d9d48508..e3bf5413e4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedCriteria.java
@@ -1,12 +1,19 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestMention;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class MentionedCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -18,7 +25,7 @@ public class MentionedCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Subquery<PullRequestMention> mentionQuery = query.subquery(PullRequestMention.class);
Root<PullRequestMention> mention = mentionQuery.from(PullRequestMention.class);
mentionQuery.select(mention);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java
index bd86e4b9a0..6222086554 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java
@@ -1,24 +1,26 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class MentionedMeCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var user = User.get();
if (user != null)
- return getCriteria(user).getPredicate(query, from, builder);
+ return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("Please login to perform this query");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
index adc0d00bb5..d3baa592f9 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,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -8,6 +9,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class MergeStrategyCriteria extends Criteria<PullRequest> {
@@ -24,7 +26,7 @@ public class MergeStrategyCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<?> attribute = from.get(PullRequest.PROP_MERGE_STRATEGY);
var predicate = builder.equal(attribute, value);
if (operator == PullRequestQueryLexer.IsNot)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
index 5650f5c4fe..5cdde1eb57 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,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequest.Status;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class MergedCriteria extends Criteria<PullRequest> {
@@ -18,8 +20,8 @@ public class MergedCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- return getCriteria().getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ return getCriteria().getPredicate(projectScope, query, from, builder);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedActionOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedActionOfCriteria.java
index 1e95098c86..29356142e2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedActionOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedActionOfCriteria.java
@@ -1,16 +1,18 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.OrCriteria;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Predicate;
-
public class NeedActionOfCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -22,8 +24,8 @@ public class NeedActionOfCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- return getCriteria().getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ return getCriteria().getPredicate(projectScope, query, from, builder);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java
index 89962c8641..1e46bf7af2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java
@@ -1,24 +1,26 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class NeedMyActionCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var user = User.get();
if (user != null)
- return getCriteria(user).getPredicate(query, from, builder);
+ return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("Please login to perform this query");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
index 81222275a9..b8335ff258 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,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequest.Status;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class OpenCriteria extends Criteria<PullRequest> {
@@ -18,8 +20,8 @@ public class OpenCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- return getCriteria().getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ return getCriteria().getPredicate(projectScope, query, from, builder);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReadyToMergeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReadyToMergeCriteria.java
index 59c23fe38c..edf7ee0ff1 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReadyToMergeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReadyToMergeCriteria.java
@@ -1,23 +1,25 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.NotCriteria;
import io.onedev.server.util.criteria.OrCriteria;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Predicate;
-
public class ReadyToMergeCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- return getCriteria().getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ return getCriteria().getPredicate(projectScope, query, from, builder);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReferenceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReferenceCriteria.java
index 6d336fcce1..931a798d7b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReferenceCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ReferenceCriteria.java
@@ -1,13 +1,18 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
import io.onedev.server.entityreference.PullRequestReference;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.annotation.Nullable;
-import javax.persistence.criteria.*;
-
public class ReferenceCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -25,7 +30,7 @@ public class ReferenceCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Long> attribute = from.get(PullRequest.PROP_NUMBER);
Predicate numberPredicate;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java
index ae6cb7457d..c2556f0b82 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,13 +1,20 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.PullRequestReview.Status;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class RequestedForChangesByCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -19,7 +26,7 @@ public class RequestedForChangesByCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Subquery<PullRequestReview> reviewQuery = query.subquery(PullRequestReview.class);
Root<PullRequestReview> review = reviewQuery.from(PullRequestReview.class);
reviewQuery.select(review);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
index eef63d6de2..04ff34c149 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,24 +1,26 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class RequestedForChangesByMeCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var user = User.get();
if (user != null)
- return getCriteria(user).getPredicate(query, from, builder);
+ return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("Please login to perform this query");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java
index 1b0c5b88be..c6808fff60 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class RocketCountCriteria extends Criteria<PullRequest> {
@@ -23,7 +25,7 @@ public class RocketCountCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(PullRequest.PROP_ROCKET_COUNT);
if (operator == PullRequestQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java
index f767eac602..b61ba3b379 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class SmileCountCriteria extends Criteria<PullRequest> {
@@ -23,7 +25,7 @@ public class SmileCountCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(PullRequest.PROP_SMILE_COUNT);
if (operator == PullRequestQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
index 48fd4b9661..b29823df02 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,18 +1,25 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.PullRequestReview.Status;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class SomeoneRequestedForChangesCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Subquery<PullRequestReview> reviewQuery = query.subquery(PullRequestReview.class);
Root<PullRequestReview> review = reviewQuery.from(PullRequestReview.class);
reviewQuery.select(review);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
index 2be5c5d813..7b7d86ed99 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,14 +1,16 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class SourceBranchCriteria extends Criteria<PullRequest> {
@@ -24,7 +26,7 @@ public class SourceBranchCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(PullRequest.PROP_SOURCE_BRANCH);
String normalized = branch.toLowerCase().replace("*", "%");
var predicate = builder.like(builder.lower(attribute), normalized);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
index f225ad022a..015b6e4e15 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,17 +1,19 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class SourceProjectCriteria extends Criteria<PullRequest> {
@@ -27,7 +29,7 @@ public class SourceProjectCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var predicate = OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder,
from.join(PullRequest.PROP_SOURCE_PROJECT, JoinType.INNER), projectPath);
if (operator == PullRequestQueryLexer.IsNot)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java
index f0d5e15c75..7d6202c56c 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,14 +1,16 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequest.Status;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequest.Status;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class StatusCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -23,7 +25,7 @@ public class StatusCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var predicate = builder.equal(from.get(PullRequest.PROP_STATUS), status);
if (operator == PullRequestQueryLexer.IsNot)
predicate = builder.not(predicate);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
index eba34835e9..a2417b4c57 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Date;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class SubmitDateCriteria extends Criteria<PullRequest> {
@@ -29,7 +31,7 @@ public class SubmitDateCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Date> attribute = from.get(PullRequest.PROP_SUBMIT_DATE);
if (operator == PullRequestQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
index 555148c581..d7d1cbdecb 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,6 +11,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class SubmittedByCriteria extends Criteria<PullRequest> {
@@ -23,7 +25,7 @@ public class SubmittedByCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<User> attribute = from.get(PullRequest.PROP_SUBMITTER);
return builder.equal(attribute, user);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
index 5fff423dab..5bf744a979 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,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -9,6 +10,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class SubmittedByMeCriteria extends Criteria<PullRequest> {
@@ -16,7 +18,7 @@ public class SubmittedByMeCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
if (User.get() != null) {
Path<?> attribute = from.get(PullRequest.PROP_SUBMITTER);
return builder.equal(attribute, User.get());
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java
index 738a010993..017e040b09 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class TadaCountCriteria extends Criteria<PullRequest> {
@@ -23,7 +25,7 @@ public class TadaCountCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(PullRequest.PROP_TADA_COUNT);
if (operator == PullRequestQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
index a66376d35a..8fc4bf919c 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,14 +1,16 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class TargetBranchCriteria extends Criteria<PullRequest> {
@@ -24,7 +26,7 @@ public class TargetBranchCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(PullRequest.PROP_TARGET_BRANCH);
String normalized = branch.toLowerCase().replace("*", "%");
var predicate = builder.like(builder.lower(attribute), normalized);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java
index a6d602359e..3f15d43138 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,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,12 +8,13 @@ import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class TargetProjectCriteria extends Criteria<PullRequest> {
@@ -28,7 +30,7 @@ public class TargetProjectCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Project> project = from.join(PullRequest.PROP_TARGET_PROJECT, JoinType.INNER);
var predicate = OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(builder, project, projectPath);
if (operator == PullRequestQueryLexer.IsNot)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java
index 0b9c243f4f..c521c52766 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ThumbsDownCountCriteria extends Criteria<PullRequest> {
@@ -23,7 +25,7 @@ public class ThumbsDownCountCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(PullRequest.PROP_THUMBS_DOWN_COUNT);
if (operator == PullRequestQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java
index 599af449c7..b5b8a180fd 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -7,6 +8,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
public class ThumbsUpCountCriteria extends Criteria<PullRequest> {
@@ -23,7 +25,7 @@ public class ThumbsUpCountCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Integer> attribute = from.get(PullRequest.PROP_THUMBS_UP_COUNT);
if (operator == PullRequestQueryLexer.Is)
return builder.equal(attribute, value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
index ebd4923288..0f503c69e2 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,14 +1,16 @@
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.Expression;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.commons.utils.match.WildcardUtils;
public class TitleCriteria extends Criteria<PullRequest> {
@@ -21,7 +23,7 @@ public class TitleCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Expression<String> attribute = from.get(PullRequest.PROP_TITLE);
return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByCriteria.java
index 614281d735..88cdee2031 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.AndCriteria;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.AndCriteria;
+import io.onedev.server.util.criteria.Criteria;
+
public class ToBeChangedByCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -21,8 +23,8 @@ public class ToBeChangedByCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- return getCriteria(user).getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ return getCriteria(user).getPredicate(projectScope, query, from, builder);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java
index 7ddebf0d20..7fdc384243 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java
@@ -1,24 +1,26 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class ToBeChangedByMeCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var user = User.get();
if (user != null)
- return getCriteria(user).getPredicate(query, from, builder);
+ return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("Please login to perform this query");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByCriteria.java
index fd4c2f9f21..fc76edff03 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.AndCriteria;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.AndCriteria;
+import io.onedev.server.util.criteria.Criteria;
+
public class ToBeMergedByCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -21,8 +23,8 @@ public class ToBeMergedByCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- return getCriteria(user).getPredicate(query, from, builder);
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ return getCriteria(user).getPredicate(projectScope, query, from, builder);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java
index b1ddd9654f..ee281e31fa 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java
@@ -1,25 +1,26 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.AndCriteria;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class ToBeMergedByMeCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var user = User.get();
if (user != null)
- return getCriteria(user).getPredicate(query, from, builder);
+ return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("Please login to perform this query");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
index 59c669bdaf..7c9cb84c7a 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,13 +1,20 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.PullRequestReview.Status;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class ToBeReviewedByCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -19,7 +26,7 @@ public class ToBeReviewedByCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Subquery<PullRequestReview> reviewQuery = query.subquery(PullRequestReview.class);
Root<PullRequestReview> review = reviewQuery.from(PullRequestReview.class);
reviewQuery.select(review);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
index f97931500d..7d52b4ee92 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,24 +1,26 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class ToBeReviewedByMeCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var user = User.get();
if (user != null)
- return getCriteria(user).getPredicate(query, from, builder);
+ return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("Please login to perform this query");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByCriteria.java
index 20ffa03d71..65f6462738 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByCriteria.java
@@ -1,12 +1,19 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestWatch;
import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-import javax.persistence.criteria.*;
-
public class WatchedByCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -18,7 +25,7 @@ public class WatchedByCriteria extends Criteria<PullRequest> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Subquery<PullRequestWatch> watchQuery = query.subquery(PullRequestWatch.class);
Root<PullRequestWatch> watch = watchQuery.from(PullRequestWatch.class);
watchQuery.select(watch);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java
index b68613848a..ea9ac38311 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java
@@ -1,24 +1,26 @@
package io.onedev.server.search.entity.pullrequest;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.util.criteria.Criteria;
-
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
public class WatchedByMeCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var user = User.get();
if (user != null)
- return getCriteria(user).getPredicate(query, from, builder);
+ return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("Please login to perform this query");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/CodeCommentTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/CodeCommentTextManager.java
new file mode 100644
index 0000000000..327386c012
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/CodeCommentTextManager.java
@@ -0,0 +1,16 @@
+package io.onedev.server.search.entitytext;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.model.CodeComment;
+
+public interface CodeCommentTextManager {
+
+ List<Long> query(@Nullable Project project, String queryString, int count);
+
+ boolean matches(CodeComment comment, String queryString);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.java
new file mode 100644
index 0000000000..4d76d6a847
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.java
@@ -0,0 +1,163 @@
+package io.onedev.server.search.entitytext;
+
+import static org.apache.lucene.document.Field.Store.NO;
+import static org.apache.lucene.search.BooleanClause.Occur.MUST;
+import static org.apache.lucene.search.BooleanClause.Occur.SHOULD;
+
+import java.io.ObjectStreamException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.LongPoint;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.search.BoostQuery;
+import org.apache.lucene.search.PrefixQuery;
+import org.apache.lucene.search.Query;
+
+import io.onedev.commons.loader.ManagedSerializedForm;
+import io.onedev.server.cluster.ClusterManager;
+import io.onedev.server.entitymanager.CodeCommentTouchManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.event.Listen;
+import io.onedev.server.event.project.codecomment.CodeCommentTouched;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentReply;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.EntityTouch;
+import io.onedev.server.persistence.SessionManager;
+import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.security.permission.ReadCode;
+import io.onedev.server.util.concurrent.BatchWorkManager;
+import io.onedev.server.util.lucene.BooleanQueryBuilder;
+import io.onedev.server.util.lucene.LuceneUtils;
+
+@Singleton
+public class DefaultCodeCommentTextManager extends EntityTextManager<CodeComment> implements CodeCommentTextManager {
+
+ private static final String FIELD_PATH = "path";
+
+ private static final String FIELD_COMMENT = "comment";
+
+ private static final String FIELD_REPLY = "reply";
+
+ private final UserManager userManager;
+
+ private final CodeCommentTouchManager touchManager;
+
+ @Inject
+ public DefaultCodeCommentTextManager(Dao dao, BatchWorkManager batchWorkManager, UserManager userManager,
+ TransactionManager transactionManager, ProjectManager projectManager,
+ ClusterManager clusterManager, SessionManager sessionManager,
+ CodeCommentTouchManager touchManager) {
+ super(dao, batchWorkManager, transactionManager, projectManager, clusterManager, sessionManager);
+ this.userManager = userManager;
+ this.touchManager = touchManager;
+ }
+
+ public Object writeReplace() throws ObjectStreamException {
+ return new ManagedSerializedForm(CodeCommentTextManager.class);
+ }
+
+ @Override
+ protected int getIndexVersion() {
+ return 9;
+ }
+
+ @Transactional
+ @Listen
+ public void on(CodeCommentTouched event) {
+ requestToIndex(event.getProject().getId());
+ }
+
+ @Override
+ protected List<? extends EntityTouch> queryTouchesAfter(Long projectId, Long afterTouchId) {
+ return touchManager.queryTouchesAfter(projectId, afterTouchId, Integer.MAX_VALUE);
+ }
+
+ @Override
+ protected void addFields(Document entityDoc, CodeComment entity) {
+ entityDoc.add(new TextField(FIELD_PATH, entity.getMark().getPath(), NO));
+ entityDoc.add(new TextField(FIELD_COMMENT, entity.getContent(), NO));
+ for (CodeCommentReply reply: entity.getReplies()) {
+ if (!reply.getUser().equals(userManager.getSystem()))
+ entityDoc.add(new TextField(FIELD_REPLY, reply.getContent(), NO));
+ }
+ }
+
+ @Nullable
+ private Query buildContentQuery(String escapedQueryString) {
+ BooleanQueryBuilder contentQueryBuilder = new BooleanQueryBuilder();
+
+ try (Analyzer analyzer = newAnalyzer()) {
+ Map<String, Float> boosts = new HashMap<>();
+ boosts.put(FIELD_PATH, 0.75f);
+ boosts.put(FIELD_COMMENT, 0.5f);
+ boosts.put(FIELD_REPLY, 0.25f);
+ MultiFieldQueryParser parser = new MultiFieldQueryParser(
+ new String[]{FIELD_PATH, FIELD_COMMENT, FIELD_REPLY}, analyzer, boosts) {
+ @Override
+ protected Query newTermQuery(Term term, float boost) {
+ return new BoostQuery(new PrefixQuery(term), boost);
+ }
+ };
+ contentQueryBuilder.add(parser.parse(escapedQueryString), SHOULD);
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ return contentQueryBuilder.build();
+ }
+
+ @Override
+ public List<Long> query(@Nullable Project project, String queryString, int count) {
+ var escaped = LuceneUtils.escape(queryString);
+ if (escaped != null) {
+ var applicableProjectIds = new HashSet<Long>();
+ if (project != null) {
+ applicableProjectIds.add(project.getId());
+ } else {
+ applicableProjectIds.addAll(SecurityUtils.getAuthorizedProjects(new ReadCode())
+ .stream().map(AbstractEntity::getId).collect(Collectors.toList()));
+ }
+ var query = buildContentQuery(escaped);
+ if (query != null)
+ return search(new EntityTextQuery(query, applicableProjectIds), count);
+ }
+ return new ArrayList<>();
+ }
+
+ @Override
+ public boolean matches(CodeComment comment, String queryString) {
+ var escaped = LuceneUtils.escape(queryString);
+ if (escaped != null) {
+ BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();
+ queryBuilder.add(LongPoint.newExactQuery(FIELD_PROJECT_ID, comment.getProject().getId()), MUST);
+ queryBuilder.add(getTermQuery(FIELD_ENTITY_ID, String.valueOf(comment.getId())), MUST);
+ queryBuilder.add(buildContentQuery(escaped), MUST);
+ var query = queryBuilder.build();
+ if (query != null)
+ return !search(new EntityTextQuery(query, Collections.singleton(comment.getProject().getId())), 1).isEmpty();
+ }
+ return false;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java
index 16be35a502..889e1d30d6 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java
@@ -1,8 +1,41 @@
package io.onedev.server.search.entitytext;
+import static io.onedev.server.util.criteria.Criteria.forManyValues;
+import static java.lang.String.valueOf;
+import static java.util.stream.Collectors.toSet;
+import static org.apache.lucene.document.Field.Store.NO;
+import static org.apache.lucene.search.BooleanClause.Occur.MUST;
+import static org.apache.lucene.search.BooleanClause.Occur.SHOULD;
+
+import java.io.ObjectStreamException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.LongPoint;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.search.BoostQuery;
+import org.apache.lucene.search.PrefixQuery;
+import org.apache.lucene.search.Query;
+
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.server.cluster.ClusterManager;
-import io.onedev.server.entitymanager.*;
+import io.onedev.server.entitymanager.IssueTouchManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.Listen;
import io.onedev.server.event.project.issue.IssuesTouched;
import io.onedev.server.model.AbstractEntity;
@@ -19,35 +52,9 @@ import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.concurrent.BatchWorkManager;
import io.onedev.server.util.lucene.BooleanQueryBuilder;
import io.onedev.server.util.lucene.LuceneUtils;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
-import org.apache.lucene.queryparser.classic.ParseException;
-import org.apache.lucene.search.BoostQuery;
-import org.apache.lucene.search.PrefixQuery;
-import org.apache.lucene.search.Query;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.io.ObjectStreamException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import static io.onedev.server.util.criteria.Criteria.forManyValues;
-import static java.lang.String.valueOf;
-import static java.util.stream.Collectors.toSet;
-import static org.apache.lucene.document.Field.Store.NO;
-import static org.apache.lucene.search.BooleanClause.Occur.MUST;
-import static org.apache.lucene.search.BooleanClause.Occur.SHOULD;
@Singleton
-public class DefaultIssueTextManager extends ProjectTextManager<Issue> implements IssueTextManager {
+public class DefaultIssueTextManager extends EntityTextManager<Issue> implements IssueTextManager {
private static final String FIELD_NUMBER = "number";
@@ -58,11 +65,7 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implement
private static final String FIELD_DESCRIPTION = "description";
private static final String FIELD_COMMENT = "comments";
-
- private final IssueFieldManager fieldManager;
-
- private final IssueLinkManager linkManager;
-
+
private final UserManager userManager;
private final IssueTouchManager touchManager;
@@ -70,13 +73,10 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implement
@Inject
public DefaultIssueTextManager(Dao dao, BatchWorkManager batchWorkManager, UserManager userManager,
TransactionManager transactionManager, ProjectManager projectManager,
- IssueFieldManager fieldManager, IssueLinkManager linkManager,
ClusterManager clusterManager, SessionManager sessionManager,
IssueTouchManager touchManager) {
super(dao, batchWorkManager, transactionManager, projectManager, clusterManager, sessionManager);
this.userManager = userManager;
- this.fieldManager = fieldManager;
- this.linkManager = linkManager;
this.touchManager = touchManager;
}
@@ -86,7 +86,7 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implement
@Override
protected int getIndexVersion() {
- return 8;
+ return 9;
}
@Override
@@ -114,11 +114,42 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implement
}
@Nullable
- private EntityTextQuery buildQuery(@Nullable ProjectScope projectScope, String queryString) {
+ private Query buildContentQuery(String escapedQueryString) {
+ BooleanQueryBuilder contentQueryBuilder = new BooleanQueryBuilder();
+
+ String numberString = escapedQueryString;
+ if (numberString.startsWith("#"))
+ numberString = numberString.substring(1);
+ try {
+ long number = Long.parseLong(numberString);
+ contentQueryBuilder.add(new BoostQuery(getTermQuery(FIELD_NUMBER, valueOf(number)), 1f), SHOULD);
+ } catch (NumberFormatException ignored) {
+ }
+
+ try (Analyzer analyzer = newAnalyzer()) {
+ Map<String, Float> boosts = new HashMap<>();
+ boosts.put(FIELD_TITLE, 0.75f);
+ boosts.put(FIELD_DESCRIPTION, 0.5f);
+ boosts.put(FIELD_COMMENT, 0.25f);
+ MultiFieldQueryParser parser = new MultiFieldQueryParser(
+ new String[]{FIELD_TITLE, FIELD_DESCRIPTION, FIELD_COMMENT}, analyzer, boosts) {
+ @Override
+ protected Query newTermQuery(Term term, float boost) {
+ return new BoostQuery(new PrefixQuery(term), boost);
+ }
+ };
+ contentQueryBuilder.add(parser.parse(escapedQueryString), SHOULD);
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ return contentQueryBuilder.build();
+ }
+
+ @Override
+ public List<Long> query(@Nullable ProjectScope projectScope, String queryString, int count) {
var escaped = LuceneUtils.escape(queryString);
if (escaped != null) {
var applicableProjectIds = new HashSet<Long>();
- BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();
if (projectScope != null) {
var project = projectScope.getProject();
applicableProjectIds.add(project.getId());
@@ -137,6 +168,7 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implement
.collect(toSet()));
}
+ var queryBuilder = new BooleanQueryBuilder();
if (!SecurityUtils.isAdministrator()) {
var permittedProjectIds = SecurityUtils.getAuthorizedProjects(new AccessConfidentialIssues())
.stream()
@@ -150,68 +182,27 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implement
confidentialQueryBuilder.add(getTermQuery(FIELD_CONFIDENTIAL, valueOf(false)), SHOULD);
queryBuilder.add(confidentialQueryBuilder.build(), MUST);
}
-
- BooleanQueryBuilder contentQueryBuilder = new BooleanQueryBuilder();
-
- String numberString = queryString;
- if (numberString.startsWith("#"))
- numberString = numberString.substring(1);
- try {
- long number = Long.parseLong(numberString);
- contentQueryBuilder.add(new BoostQuery(getTermQuery(FIELD_NUMBER, valueOf(number)), 1f), SHOULD);
- } catch (NumberFormatException ignored) {
- }
-
- try (Analyzer analyzer = newAnalyzer()) {
- Map<String, Float> boosts = new HashMap<>();
- boosts.put(FIELD_TITLE, 0.75f);
- boosts.put(FIELD_DESCRIPTION, 0.5f);
- boosts.put(FIELD_COMMENT, 0.25f);
- MultiFieldQueryParser parser = new MultiFieldQueryParser(
- new String[]{FIELD_TITLE, FIELD_DESCRIPTION, FIELD_COMMENT}, analyzer, boosts) {
- @Override
- protected Query newTermQuery(Term term, float boost) {
- return new BoostQuery(new PrefixQuery(term), boost);
- }
- };
- contentQueryBuilder.add(parser.parse(escaped), SHOULD);
- } catch (ParseException e) {
- throw new RuntimeException(e);
- }
- queryBuilder.add(contentQueryBuilder.build(), MUST);
-
+ queryBuilder.add(buildContentQuery(escaped), MUST);
var query = queryBuilder.build();
if (query != null)
- return new EntityTextQuery(query, applicableProjectIds);
+ return search(new EntityTextQuery(query, applicableProjectIds), count);
}
- return null;
- }
-
- @Override
- public List<Issue> query(@Nullable ProjectScope projectScope, String queryString,
- boolean loadFieldsAndLinks, int firstResult, int maxResults) {
- var issues = search(buildQuery(projectScope, queryString), firstResult, maxResults);
- if (projectScope != null) {
- for (var it = issues.iterator(); it.hasNext(); ) {
- var issue = it.next();
- if (!issue.getProject().equals(projectScope.getProject())
- && (!projectScope.isInherited() || !issue.getProject().isSelfOrAncestorOf(projectScope.getProject())
- && (!projectScope.isRecursive() || !projectScope.getProject().isSelfOrAncestorOf(issue.getProject())))) {
- it.remove();
- }
- }
- }
- if (loadFieldsAndLinks && !issues.isEmpty()) {
- fieldManager.populateFields(issues);
- linkManager.populateLinks(issues);
- }
-
- return issues;
+ return new ArrayList<>();
}
@Override
- public long count(@Nullable ProjectScope projectScope, String queryString) {
- return count(buildQuery(projectScope, queryString));
+ public boolean matches(Issue issue, String queryString) {
+ var escaped = LuceneUtils.escape(queryString);
+ if (escaped != null) {
+ BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();
+ queryBuilder.add(LongPoint.newExactQuery(FIELD_PROJECT_ID, issue.getProject().getId()), MUST);
+ queryBuilder.add(getTermQuery(FIELD_ENTITY_ID, String.valueOf(issue.getId())), MUST);
+ queryBuilder.add(buildContentQuery(escaped), MUST);
+ var query = queryBuilder.build();
+ if (query != null)
+ return !search(new EntityTextQuery(query, Collections.singleton(issue.getProject().getId())), 1).isEmpty();
+ }
+ return false;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java
new file mode 100644
index 0000000000..fd1a0632bb
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java
@@ -0,0 +1,176 @@
+package io.onedev.server.search.entitytext;
+
+import static java.lang.String.valueOf;
+import static org.apache.lucene.document.Field.Store.NO;
+import static org.apache.lucene.search.BooleanClause.Occur.MUST;
+import static org.apache.lucene.search.BooleanClause.Occur.SHOULD;
+
+import java.io.ObjectStreamException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.LongPoint;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.search.BoostQuery;
+import org.apache.lucene.search.PrefixQuery;
+import org.apache.lucene.search.Query;
+
+import io.onedev.commons.loader.ManagedSerializedForm;
+import io.onedev.server.cluster.ClusterManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.PullRequestTouchManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.event.Listen;
+import io.onedev.server.event.project.pullrequest.PullRequestTouched;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.support.EntityTouch;
+import io.onedev.server.persistence.SessionManager;
+import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.security.permission.ReadCode;
+import io.onedev.server.util.concurrent.BatchWorkManager;
+import io.onedev.server.util.lucene.BooleanQueryBuilder;
+import io.onedev.server.util.lucene.LuceneUtils;
+
+@Singleton
+public class DefaultPullRequestTextManager extends EntityTextManager<PullRequest> implements PullRequestTextManager {
+
+ private static final String FIELD_NUMBER = "number";
+
+ private static final String FIELD_TITLE = "title";
+
+ private static final String FIELD_DESCRIPTION = "description";
+
+ private static final String FIELD_COMMENT = "comments";
+
+ private final UserManager userManager;
+
+ private final PullRequestTouchManager touchManager;
+
+ @Inject
+ public DefaultPullRequestTextManager(Dao dao, BatchWorkManager batchWorkManager, UserManager userManager,
+ TransactionManager transactionManager, ProjectManager projectManager,
+ ClusterManager clusterManager, SessionManager sessionManager,
+ PullRequestTouchManager touchManager) {
+ super(dao, batchWorkManager, transactionManager, projectManager, clusterManager, sessionManager);
+ this.userManager = userManager;
+ this.touchManager = touchManager;
+ }
+
+ public Object writeReplace() throws ObjectStreamException {
+ return new ManagedSerializedForm(PullRequestTextManager.class);
+ }
+
+ @Override
+ protected int getIndexVersion() {
+ return 9;
+ }
+
+ @Transactional
+ @Listen
+ public void on(PullRequestTouched event) {
+ requestToIndex(event.getProject().getId());
+ }
+
+ @Override
+ protected List<? extends EntityTouch> queryTouchesAfter(Long projectId, Long afterTouchId) {
+ return touchManager.queryTouchesAfter(projectId, afterTouchId, Integer.MAX_VALUE);
+ }
+
+ @Override
+ protected void addFields(Document entityDoc, PullRequest entity) {
+ entityDoc.add(new StringField(FIELD_NUMBER, valueOf(entity.getNumber()), NO));
+ entityDoc.add(new TextField(FIELD_TITLE, entity.getTitle(), NO));
+ if (entity.getDescription() != null)
+ entityDoc.add(new TextField(FIELD_DESCRIPTION, entity.getDescription(), NO));
+ for (var comment: entity.getComments()) {
+ if (!comment.getUser().equals(userManager.getSystem()))
+ entityDoc.add(new TextField(FIELD_COMMENT, comment.getContent(), NO));
+ }
+ }
+
+ @Nullable
+ private Query buildContentQuery(String escapedQueryString) {
+ BooleanQueryBuilder contentQueryBuilder = new BooleanQueryBuilder();
+
+ String numberString = escapedQueryString;
+ if (numberString.startsWith("#"))
+ numberString = numberString.substring(1);
+ try {
+ long number = Long.parseLong(numberString);
+ contentQueryBuilder.add(new BoostQuery(getTermQuery(FIELD_NUMBER, valueOf(number)), 1f), SHOULD);
+ } catch (NumberFormatException ignored) {
+ }
+
+ try (Analyzer analyzer = newAnalyzer()) {
+ Map<String, Float> boosts = new HashMap<>();
+ boosts.put(FIELD_TITLE, 0.75f);
+ boosts.put(FIELD_DESCRIPTION, 0.5f);
+ boosts.put(FIELD_COMMENT, 0.25f);
+ MultiFieldQueryParser parser = new MultiFieldQueryParser(
+ new String[]{FIELD_TITLE, FIELD_DESCRIPTION, FIELD_COMMENT}, analyzer, boosts) {
+ @Override
+ protected Query newTermQuery(Term term, float boost) {
+ return new BoostQuery(new PrefixQuery(term), boost);
+ }
+ };
+ contentQueryBuilder.add(parser.parse(escapedQueryString), SHOULD);
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ return contentQueryBuilder.build();
+ }
+
+ @Override
+ public List<Long> query(@Nullable Project project, String queryString, int count) {
+ var escaped = LuceneUtils.escape(queryString);
+ if (escaped != null) {
+ var applicableProjectIds = new HashSet<Long>();
+ if (project != null) {
+ applicableProjectIds.add(project.getId());
+ } else {
+ applicableProjectIds.addAll(SecurityUtils.getAuthorizedProjects(new ReadCode())
+ .stream().map(AbstractEntity::getId).collect(Collectors.toList()));
+ }
+ var query = buildContentQuery(escaped);
+ if (query != null)
+ return search(new EntityTextQuery(query, applicableProjectIds), count);
+ }
+ return new ArrayList<>();
+ }
+
+ @Override
+ public boolean matches(PullRequest request, String queryString) {
+ var escaped = LuceneUtils.escape(queryString);
+ if (escaped != null) {
+ BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();
+ queryBuilder.add(LongPoint.newExactQuery(FIELD_PROJECT_ID, request.getProject().getId()), MUST);
+ queryBuilder.add(getTermQuery(FIELD_ENTITY_ID, String.valueOf(request.getId())), MUST);
+ queryBuilder.add(buildContentQuery(escaped), MUST);
+ var query = queryBuilder.build();
+ if (query != null)
+ return !search(new EntityTextQuery(query, Collections.singleton(request.getProject().getId())), 1).isEmpty();
+ }
+ return false;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextManager.java
similarity index 80%
rename from server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java
rename to server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextManager.java
index 34c246f5f7..7940dac40b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextManager.java
@@ -1,32 +1,28 @@
package io.onedev.server.search.entitytext;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.WordUtils;
-import io.onedev.server.OneDev;
-import io.onedev.server.cluster.ClusterManager;
-import io.onedev.server.cluster.ClusterTask;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.event.Listen;
-import io.onedev.server.event.project.ActiveServerChanged;
-import io.onedev.server.event.project.ProjectDeleted;
-import io.onedev.server.event.system.SystemStarted;
-import io.onedev.server.event.system.SystemStarting;
-import io.onedev.server.event.system.SystemStopped;
-import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.support.EntityTouch;
-import io.onedev.server.model.support.ProjectBelonging;
-import io.onedev.server.persistence.SessionManager;
-import io.onedev.server.persistence.TransactionManager;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.util.ReflectionUtils;
-import io.onedev.server.util.concurrent.BatchWorkManager;
-import io.onedev.server.util.concurrent.BatchWorker;
-import io.onedev.server.util.concurrent.Prioritized;
-import io.onedev.server.util.lucene.BooleanQueryBuilder;
-import io.onedev.server.util.lucene.LuceneUtils;
+import static com.google.common.collect.Lists.partition;
+import static io.onedev.server.util.criteria.Criteria.forManyValues;
+import static java.lang.Long.valueOf;
+import static java.lang.Math.min;
+import static java.util.stream.Collectors.toList;
+import static org.apache.lucene.document.Field.Store.YES;
+import static org.apache.lucene.document.LongPoint.newExactQuery;
+import static org.apache.lucene.search.BooleanClause.Occur.MUST;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+import javax.annotation.Nullable;
+
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.WordlistLoader;
@@ -50,39 +46,56 @@ import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.LongPoint;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.*;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexFormatTooOldException;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.queryparser.classic.QueryParser;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.SearcherManager;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.IOUtils;
-import org.hibernate.criterion.Restrictions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nullable;
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.function.Function;
-
-import static com.google.common.collect.Lists.partition;
-import static io.onedev.server.util.criteria.Criteria.forManyValues;
-import static java.lang.Long.valueOf;
-import static java.lang.Math.min;
-import static java.util.stream.Collectors.toList;
-import static org.apache.lucene.document.Field.Store.YES;
-import static org.apache.lucene.document.LongPoint.newExactQuery;
-import static org.apache.lucene.search.BooleanClause.Occur.MUST;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.WordUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.cluster.ClusterManager;
+import io.onedev.server.cluster.ClusterTask;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.event.Listen;
+import io.onedev.server.event.project.ActiveServerChanged;
+import io.onedev.server.event.project.ProjectDeleted;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.event.system.SystemStarting;
+import io.onedev.server.event.system.SystemStopped;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.support.EntityTouch;
+import io.onedev.server.model.support.ProjectBelonging;
+import io.onedev.server.persistence.SessionManager;
+import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.util.concurrent.BatchWorkManager;
+import io.onedev.server.util.concurrent.BatchWorker;
+import io.onedev.server.util.concurrent.Prioritized;
+import io.onedev.server.util.lucene.BooleanQueryBuilder;
+import io.onedev.server.util.lucene.LuceneUtils;
-public abstract class ProjectTextManager<T extends ProjectBelonging> implements Serializable {
+public abstract class EntityTextManager<T extends ProjectBelonging> implements Serializable {
private static final long serialVersionUID = 1L;
- private static final Logger logger = LoggerFactory.getLogger(ProjectTextManager.class);
+ private static final Logger logger = LoggerFactory.getLogger(EntityTextManager.class);
private static final String FIELD_TYPE = "type";
@@ -92,7 +105,7 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implements
private static final String FIELD_TOUCH_ID = "touchId";
- private static final String FIELD_ENTITY_ID = "entityId";
+ protected static final String FIELD_ENTITY_ID = "entityId";
protected static final String FIELD_PROJECT_ID = "projectId";
@@ -121,7 +134,7 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implements
STOP_WORDS.addAll(WordlistLoader.getSnowballWordSet(IOUtils.getDecodingReader(
SnowballFilter.class, "english_stop.txt", StandardCharsets.UTF_8)));
STOP_WORDS.addAll(WordlistLoader.getWordSet(IOUtils.getDecodingReader(
- ProjectTextManager.class, "chinese_stop.txt", StandardCharsets.UTF_8)));
+ EntityTextManager.class, "chinese_stop.txt", StandardCharsets.UTF_8)));
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -144,10 +157,10 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implements
private volatile SearcherManager searcherManager;
@SuppressWarnings("unchecked")
- public ProjectTextManager(Dao dao, BatchWorkManager batchWorkManager,
+ public EntityTextManager(Dao dao, BatchWorkManager batchWorkManager,
TransactionManager transactionManager, ProjectManager projectManager,
ClusterManager clusterManager, SessionManager sessionManager) {
- List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(ProjectTextManager.class, getClass());
+ List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(EntityTextManager.class, getClass());
if (typeArguments.size() == 1 && AbstractEntity.class.isAssignableFrom(typeArguments.get(0))) {
entityClass = (Class<T>) typeArguments.get(0);
} else {
@@ -345,87 +358,41 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implements
return queryBuilder.build();
}
- protected long count(@Nullable EntityTextQuery query) {
- if (query != null) {
- String contentQueryString = query.getContentQuery().toString();
- var projectIdsByServer = projectManager.groupByActiveServers(query.getApplicableProjectIds());
- return clusterManager.runOnServers(projectIdsByServer.keySet(), () -> {
- if (searcherManager != null) {
- try {
- IndexSearcher indexSearcher = searcherManager.acquire();
- try {
- TotalHitCountCollector collector = new TotalHitCountCollector();
- indexSearcher.search(buildQuery(projectIdsByServer, contentQueryString), collector);
- return (long) collector.getTotalHits();
- } finally {
- searcherManager.release(indexSearcher);
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- } else {
- return 0L;
- }
- }).values().stream().reduce(0L, Long::sum);
- } else {
- return 0;
- }
- }
-
- protected List<T> search(@Nullable EntityTextQuery query, int firstResult, int maxResults) {
- if (query != null) {
- String contentQueryString = query.getContentQuery().toString();
- var projectIdsByServer = projectManager.groupByActiveServers(query.getApplicableProjectIds());
- Map<Long, Float> entityScores = new HashMap<>();
- for (var entry : clusterManager.runOnServers(projectIdsByServer.keySet(), (ClusterTask<Map<Long, Float>>) () -> {
- if (searcherManager != null) {
+ protected List<Long> search(EntityTextQuery query, int count) {
+ String contentQueryString = query.getContentQuery().toString();
+ var projectIdsByServer = projectManager.groupByActiveServers(query.getApplicableProjectIds());
+ Map<Long, Float> entityScores = new HashMap<>();
+ for (var entry : clusterManager.runOnServers(projectIdsByServer.keySet(), (ClusterTask<Map<Long, Float>>) () -> {
+ if (searcherManager != null) {
+ try {
+ IndexSearcher searcher = searcherManager.acquire();
try {
- IndexSearcher searcher = searcherManager.acquire();
- try {
- Map<Long, Float> innerEntityScores = new HashMap<>();
- TopDocs topDocs = searcher.search(buildQuery(projectIdsByServer, contentQueryString), firstResult + maxResults);
- for (var scoreDoc : topDocs.scoreDocs) {
- Document doc = searcher.doc(scoreDoc.doc);
- innerEntityScores.put(valueOf(doc.get(FIELD_ENTITY_ID)), scoreDoc.score);
- }
- return innerEntityScores;
- } finally {
- searcherManager.release(searcher);
+ Map<Long, Float> innerEntityScores = new HashMap<>();
+ TopDocs topDocs = searcher.search(buildQuery(projectIdsByServer, contentQueryString), count);
+ for (var scoreDoc : topDocs.scoreDocs) {
+ Document doc = searcher.doc(scoreDoc.doc);
+ innerEntityScores.put(valueOf(doc.get(FIELD_ENTITY_ID)), scoreDoc.score);
}
- } catch (IOException e) {
- throw new RuntimeException(e);
+ return innerEntityScores;
+ } finally {
+ searcherManager.release(searcher);
}
- } else {
- return new HashMap<>();
- }
- }).entrySet()) {
- entityScores.putAll(entry.getValue());
- }
-
- List<Map.Entry<Long, Float>> entries = new ArrayList<>(entityScores.entrySet());
- entries.sort((o1, o2) -> o2.getValue().compareTo(o1.getValue()));
-
- if (firstResult < entries.size()) {
- entries = entries.subList(firstResult, min(firstResult + maxResults, entries.size()));
- EntityCriteria<T> criteria = EntityCriteria.of(entityClass);
- criteria.add(Restrictions.in(
- AbstractEntity.PROP_ID,
- entries.stream().map(Map.Entry::getKey).collect(toList())));
-
- var mapOfEntities = new HashMap<Long, T>();
- for (var entity: dao.query(criteria))
- mapOfEntities.put(entity.getId(), entity);
-
- var entities = new ArrayList<T>();
- for (var entry: entries) {
- var entity = mapOfEntities.get(entry.getKey());
- if (entity != null)
- entities.add(entity);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
- return entities;
} else {
- return new ArrayList<>();
+ return new HashMap<>();
}
+ }).entrySet()) {
+ entityScores.putAll(entry.getValue());
+ }
+
+ List<Map.Entry<Long, Float>> entries = new ArrayList<>(entityScores.entrySet());
+ entries.sort((o1, o2) -> o2.getValue().compareTo(o1.getValue()));
+
+ if (!entries.isEmpty()) {
+ entries = entries.subList(0, min(count, entries.size()));
+ return entries.stream().map(Map.Entry::getKey).collect(toList());
} else {
return new ArrayList<>();
}
@@ -484,7 +451,6 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implements
protected abstract int getIndexVersion();
- @Nullable
protected abstract List<? extends EntityTouch> queryTouchesAfter(Long projectId, Long touchId);
protected abstract void addFields(Document entityDoc, T entity);
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/IssueTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/IssueTextManager.java
index 1440fc0515..ddab0a3acb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/IssueTextManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/IssueTextManager.java
@@ -9,9 +9,8 @@ import io.onedev.server.util.ProjectScope;
public interface IssueTextManager {
- long count(@Nullable ProjectScope projectScope, String queryString);
-
- List<Issue> query(@Nullable ProjectScope projectScope, String queryString,
- boolean loadFieldsAndLinks, int firstResult, int maxResults);
-
+ List<Long> query(@Nullable ProjectScope projectScope, String queryString, int count);
+
+ boolean matches(Issue issue, String queryString);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/PullRequestTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/PullRequestTextManager.java
new file mode 100644
index 0000000000..471462d26c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/PullRequestTextManager.java
@@ -0,0 +1,16 @@
+package io.onedev.server.search.entitytext;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+
+public interface PullRequestTextManager {
+
+ List<Long> query(@Nullable Project project, String queryString, int count);
+
+ boolean matches(PullRequest request, String queryString);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScope.java b/server-core/src/main/java/io/onedev/server/util/ProjectScope.java
index 25831139e9..05f2212a0c 100644
--- a/server-core/src/main/java/io/onedev/server/util/ProjectScope.java
+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScope.java
@@ -1,6 +1,9 @@
package io.onedev.server.util;
+import java.util.Collection;
+
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.ProjectBelonging;
public class ProjectScope {
@@ -28,4 +31,15 @@ public class ProjectScope {
return recursive;
}
+ public void filter(Collection<? extends ProjectBelonging> entities) {
+ for (var it = entities.iterator(); it.hasNext(); ) {
+ var entity = it.next();
+ if (!entity.getProject().equals(project)
+ && (!inherited || !entity.getProject().isSelfOrAncestorOf(project)
+ && (!recursive || !project.isSelfOrAncestorOf(entity.getProject())))) {
+ it.remove();
+ }
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
index 6638237c77..f8242317eb 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
@@ -1,13 +1,23 @@
package io.onedev.server.util.criteria;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+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;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.Order;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
@@ -28,10 +38,10 @@ public class AndCriteria<T> extends Criteria<T> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<T, T> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<T, T> root, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
for (Criteria<T> criteria: criterias)
- predicates.add(criteria.getPredicate(query, root, builder));
+ predicates.add(criteria.getPredicate(projectScope, query, root, builder));
return builder.and(predicates.toArray(new Predicate[0]));
}
@@ -40,6 +50,11 @@ public class AndCriteria<T> extends Criteria<T> {
return criterias.stream().allMatch(it->it.matches(t));
}
+ @Override
+ public List<Order> getPreferOrders(CriteriaBuilder builder, From<T, T> from) {
+ return criterias.stream().flatMap(it->it.getPreferOrders(builder, from).stream()).collect(Collectors.toList());
+ }
+
@Override
public void onRenameUser(String oldName, String newName) {
criterias.stream().forEach(it->it.onRenameUser(oldName, newName));
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java
index 1d3a1a512b..6ad06e9340 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java
@@ -1,23 +1,36 @@
package io.onedev.server.util.criteria;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Order;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import org.apache.lucene.document.LongPoint;
+import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.Query;
+
import com.google.common.base.CharMatcher;
import com.google.common.base.Splitter;
+
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.RangeBuilder;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;
-import org.apache.lucene.document.LongPoint;
-import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.Query;
-
-import javax.annotation.Nullable;
-import javax.persistence.criteria.*;
-import java.io.Serializable;
-import java.util.*;
public abstract class Criteria<T> implements Serializable {
@@ -98,9 +111,13 @@ public abstract class Criteria<T> implements Serializable {
builder.forDiscretes(inClause);
}
- public abstract Predicate getPredicate(CriteriaQuery<?> query, From<T, T> from, CriteriaBuilder builder);
+ public abstract Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<T, T> from, CriteriaBuilder builder);
public abstract boolean matches(T t);
+
+ public List<Order> getPreferOrders(CriteriaBuilder builder, From<T, T> from) {
+ return new ArrayList<>();
+ }
public Criteria<T> withParens(boolean withParens) {
this.withParens = withParens;
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java
index 78bc424ec8..458bd17ace 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java
@@ -1,13 +1,17 @@
package io.onedev.server.util.criteria;
import java.util.Collection;
+import java.util.List;
import java.util.Map;
+import javax.annotation.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.Order;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
@@ -24,8 +28,8 @@ public class NotCriteria<T> extends Criteria<T> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<T, T> root, CriteriaBuilder builder) {
- return builder.not(criteria.getPredicate(query, root, builder));
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<T, T> root, CriteriaBuilder builder) {
+ return builder.not(criteria.getPredicate(projectScope, query, root, builder));
}
@Override
@@ -33,6 +37,11 @@ public class NotCriteria<T> extends Criteria<T> {
return !criteria.matches(entity);
}
+ @Override
+ public List<Order> getPreferOrders(CriteriaBuilder builder, From<T, T> from) {
+ return criteria.getPreferOrders(builder, from);
+ }
+
@Override
public void onRenameUser(String oldName, String newName) {
criteria.onRenameUser(oldName, newName);
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
index 35837f6d6c..369b17a0ab 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
@@ -1,13 +1,23 @@
package io.onedev.server.util.criteria;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+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;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.Order;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
@@ -28,10 +38,10 @@ public class OrCriteria<T> extends Criteria<T> {
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<T, T> root, CriteriaBuilder builder) {
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<T, T> root, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
for (Criteria<T> criteria: criterias)
- predicates.add(criteria.getPredicate(query, root, builder));
+ predicates.add(criteria.getPredicate(projectScope, query, root, builder));
return builder.or(predicates.toArray(new Predicate[0]));
}
@@ -40,6 +50,11 @@ public class OrCriteria<T> extends Criteria<T> {
return criterias.stream().anyMatch(it->it.matches(t));
}
+ @Override
+ public List<Order> getPreferOrders(CriteriaBuilder builder, From<T, T> from) {
+ return criterias.stream().flatMap(it->it.getPreferOrders(builder, from).stream()).collect(Collectors.toList());
+ }
+
@Override
public void onRenameUser(String oldName, String newName) {
criterias.stream().forEach(it->it.onRenameUser(oldName, newName));
diff --git a/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java b/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java
index a33459551f..28b3fc3a19 100644
--- a/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java
@@ -1,8 +1,12 @@
package io.onedev.server.util.lucene;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.util.WriterCallable;
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Function;
+
+import javax.annotation.Nullable;
+
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
@@ -15,11 +19,8 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.bouncycastle.util.Arrays;
-import javax.annotation.Nullable;
-import java.io.File;
-import java.io.IOException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Function;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.StringUtils;
public class LuceneUtils {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java
index 262d0d29e8..2cd46d7b8e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java
@@ -15,13 +15,15 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.Similarities;
import io.onedev.server.web.component.markdown.AtWhoReferenceSupport;
import io.onedev.server.web.component.markdown.MarkdownEditor;
import io.onedev.server.web.component.markdown.UserMentionSupport;
-@SuppressWarnings("serial")
public abstract class CommentInput extends MarkdownEditor {
public CommentInput(String id, IModel<String> model, boolean compactMode) {
@@ -81,18 +83,23 @@ public abstract class CommentInput extends MarkdownEditor {
@Override
public List<PullRequest> queryPullRequests(Project project, String query, int count) {
- if (SecurityUtils.canReadCode(project))
- return OneDev.getInstance(PullRequestManager.class).query(project, query, count);
- else
+ if (SecurityUtils.canReadCode(project)) {
+ var requestQuery = new PullRequestQuery(new io.onedev.server.search.entity.pullrequest.FuzzyCriteria(query));
+ return OneDev.getInstance(PullRequestManager.class).query(project, requestQuery, false, 0, count);
+ } else {
return new ArrayList<>();
+ }
}
@Override
public List<Issue> queryIssues(Project project, String query, int count) {
- if (SecurityUtils.canAccessProject(project))
- return OneDev.getInstance(IssueManager.class).query(null, project, query, count);
- else
+ if (SecurityUtils.canAccessProject(project)) {
+ var projectScope = new ProjectScope(project, false, false);
+ var issueQuery = new IssueQuery(new io.onedev.server.search.entity.issue.FuzzyCriteria(query));
+ return OneDev.getInstance(IssueManager.class).query(projectScope, issueQuery, false, 0, count);
+ } else {
return new ArrayList<>();
+ }
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
index a5ab41f133..65819fd09b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
@@ -1,25 +1,31 @@
package io.onedev.server.web.component.issue.choice;
+import java.util.Collection;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+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.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.issue.FuzzyCriteria;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.ProjectScopedQuery;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.component.select2.ChoiceProvider;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
-import org.hibernate.Hibernate;
-import org.json.JSONException;
-import org.json.JSONWriter;
-import org.unbescape.html.HtmlEscape;
-
-import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.List;
public abstract class IssueChoiceProvider extends ChoiceProvider<Issue> {
@@ -55,11 +61,13 @@ public abstract class IssueChoiceProvider extends ChoiceProvider<Issue> {
@Override
public void query(String term, int page, Response<Issue> response) {
- int count = (page+1) * WebConstants.PAGE_SIZE + 1;
+ var count = (page+1) * WebConstants.PAGE_SIZE + 1;
var scopedQuery = ProjectScopedQuery.of(getProject(), term, '#', '-');
if (scopedQuery != null) {
- List<Issue> issues = OneDev.getInstance(IssueManager.class)
- .query(getScope(), scopedQuery.getProject(), scopedQuery.getQuery(), count);
+ var projectScope = new ProjectScope(scopedQuery.getProject(), false, false);
+ var issueQuery = new IssueQuery(new FuzzyCriteria(scopedQuery.getQuery()));
+ var issues = OneDev.getInstance(IssueManager.class)
+ .query(projectScope, issueQuery, false, 0, count);
new ResponseFiller<>(response).fill(issues, page, WebConstants.PAGE_SIZE);
} else {
response.setHasMore(false);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index 35ac99f25d..c871845982 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
@@ -1,11 +1,47 @@
package io.onedev.server.web.component.issue.create;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.CallbackParameter;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+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.IRequestParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.util.convert.ConversionException;
+import org.apache.wicket.validation.IValidationError;
+import org.apache.wicket.validation.IValidator;
+import org.unbescape.javascript.JavaScriptEscape;
+
import com.google.common.base.Objects;
+
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
import io.onedev.server.attachment.ProjectAttachmentSupport;
import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
+import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueSchedule;
@@ -34,40 +70,10 @@ import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.BeanUpdating;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.WicketUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.CallbackParameter;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.event.IEvent;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-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.IRequestParameters;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.util.convert.ConversionException;
-import org.apache.wicket.validation.IErrorMessageSource;
-import org.apache.wicket.validation.IValidatable;
-import org.apache.wicket.validation.IValidationError;
-import org.apache.wicket.validation.IValidator;
-import org.unbescape.javascript.JavaScriptEscape;
-
-import javax.annotation.Nullable;
-import java.io.Serializable;
-import java.util.*;
-@SuppressWarnings("serial")
public abstract class NewIssueEditor extends FormComponentPanel<Issue> implements InputContext {
+ private static final int MAX_SIMILAR_ISSUES = 5;
private String uuid = UUID.randomUUID().toString();
private TextField<String> titleInput;
@@ -132,9 +138,11 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
protected List<Issue> load() {
if (StringUtils.isNotBlank(editingTitle)) {
IssueTextManager issueTextManager = OneDev.getInstance(IssueTextManager.class);
- return issueTextManager.query(
- new ProjectScope(getProject(), true, true),
- editingTitle, false, 0, 5);
+ var projectScope = new ProjectScope(getProject(), true, true);
+ var issueIds = issueTextManager.query(projectScope, editingTitle, MAX_SIMILAR_ISSUES);
+ var issues = OneDev.getInstance(IssueManager.class).loadIssues(issueIds);
+ projectScope.filter(issues);
+ return issues;
} else {
return new ArrayList<>();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index e41fb67abe..da8f34f35f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -116,7 +116,6 @@ import static io.onedev.server.search.entity.issue.IssueQuery.merge;
import static java.util.Comparator.comparingInt;
import static java.util.stream.Collectors.toList;
-@SuppressWarnings("serial")
public abstract class IssueListPanel extends Panel {
private final IModel<String> queryStringModel;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
index 8d8205b333..42f039326f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
@@ -1,24 +1,29 @@
package io.onedev.server.web.component.pullrequest.choice;
+import java.util.Collection;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+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.PullRequestManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.search.entity.pullrequest.FuzzyCriteria;
+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.util.ProjectScopedQuery;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.component.select2.ChoiceProvider;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
-import org.hibernate.Hibernate;
-import org.json.JSONException;
-import org.json.JSONWriter;
-import org.unbescape.html.HtmlEscape;
-
-import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.List;
public abstract class PullRequestChoiceProvider extends ChoiceProvider<PullRequest> {
@@ -50,7 +55,7 @@ public abstract class PullRequestChoiceProvider extends ChoiceProvider<PullReque
var scopedQuery = ProjectScopedQuery.of(getProject(), term, '#', '-');
if (scopedQuery != null) {
List<PullRequest> requests = OneDev.getInstance(PullRequestManager.class)
- .query(scopedQuery.getProject(), scopedQuery.getQuery(), count);
+ .query(scopedQuery.getProject(), new PullRequestQuery(new FuzzyCriteria(scopedQuery.getQuery())), false, 0, count);
new ResponseFiller<>(response).fill(requests, page, WebConstants.PAGE_SIZE);
} else {
response.setHasMore(false);
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
index 10a9354571..dc64e7ed5b 100644
--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
@@ -1,5 +1,11 @@
package io.onedev.server.web.mapper;
+import org.apache.wicket.core.request.mapper.ResourceMapper;
+import org.apache.wicket.markup.html.pages.BrowserInfoPage;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.mapper.CompoundRequestMapper;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.web.asset.icon.IconScope;
import io.onedev.server.web.page.admin.alertsettings.AlertSettingPage;
@@ -11,7 +17,20 @@ import io.onedev.server.web.page.admin.buildsetting.agent.AgentLogPage;
import io.onedev.server.web.page.admin.buildsetting.agent.AgentOverviewPage;
import io.onedev.server.web.page.admin.buildsetting.jobexecutor.JobExecutorsPage;
import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
-import io.onedev.server.web.page.admin.emailtemplates.*;
+import io.onedev.server.web.page.admin.emailtemplates.AlertTemplatePage;
+import io.onedev.server.web.page.admin.emailtemplates.BuildNotificationTemplatePage;
+import io.onedev.server.web.page.admin.emailtemplates.CommitNotificationTemplatePage;
+import io.onedev.server.web.page.admin.emailtemplates.EmailVerificationTemplatePage;
+import io.onedev.server.web.page.admin.emailtemplates.IssueNotificationTemplatePage;
+import io.onedev.server.web.page.admin.emailtemplates.IssueNotificationUnsubscribedTemplatePage;
+import io.onedev.server.web.page.admin.emailtemplates.PackNotificationTemplatePage;
+import io.onedev.server.web.page.admin.emailtemplates.PasswordResetTemplatePage;
+import io.onedev.server.web.page.admin.emailtemplates.PullRequestNotificationTemplatePage;
+import io.onedev.server.web.page.admin.emailtemplates.PullRequestNotificationUnsubscribedTemplatePage;
+import io.onedev.server.web.page.admin.emailtemplates.ServiceDeskIssueOpenFailedTemplatePage;
+import io.onedev.server.web.page.admin.emailtemplates.ServiceDeskIssueOpenedTemplatePage;
+import io.onedev.server.web.page.admin.emailtemplates.StopwatchOverdueTemplatePage;
+import io.onedev.server.web.page.admin.emailtemplates.UserInvitationTemplatePage;
import io.onedev.server.web.page.admin.gpgsigningkey.GpgSigningKeyPage;
import io.onedev.server.web.page.admin.gpgtrustedkeys.GpgTrustedKeysPage;
import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;
@@ -97,9 +116,17 @@ import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
import io.onedev.server.web.page.project.imports.ProjectImportPage;
import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
-import io.onedev.server.web.page.project.issues.detail.*;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
+import io.onedev.server.web.page.project.issues.detail.IssueAuthorizationsPage;
+import io.onedev.server.web.page.project.issues.detail.IssueBuildsPage;
+import io.onedev.server.web.page.project.issues.detail.IssueCommitsPage;
+import io.onedev.server.web.page.project.issues.detail.IssuePullRequestsPage;
import io.onedev.server.web.page.project.issues.imports.IssueImportPage;
-import io.onedev.server.web.page.project.issues.iteration.*;
+import io.onedev.server.web.page.project.issues.iteration.IterationBurndownPage;
+import io.onedev.server.web.page.project.issues.iteration.IterationEditPage;
+import io.onedev.server.web.page.project.issues.iteration.IterationIssuesPage;
+import io.onedev.server.web.page.project.issues.iteration.IterationListPage;
+import io.onedev.server.web.page.project.issues.iteration.NewIterationPage;
import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
import io.onedev.server.web.page.project.packs.ProjectPacksPage;
import io.onedev.server.web.page.project.packs.detail.PackDetailPage;
@@ -110,7 +137,11 @@ import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequ
import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;
import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;
-import io.onedev.server.web.page.project.setting.build.*;
+import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;
+import io.onedev.server.web.page.project.setting.build.CacheManagementPage;
+import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPage;
+import io.onedev.server.web.page.project.setting.build.JobPropertiesPage;
+import io.onedev.server.web.page.project.setting.build.JobSecretsPage;
import io.onedev.server.web.page.project.setting.code.analysis.CodeAnalysisSettingPage;
import io.onedev.server.web.page.project.setting.code.branchprotection.BranchProtectionsPage;
import io.onedev.server.web.page.project.setting.code.git.GitPackConfigPage;
@@ -125,14 +156,26 @@ import io.onedev.server.web.page.project.stats.code.SourceLinesPage;
import io.onedev.server.web.page.project.tags.ProjectTagsPage;
import io.onedev.server.web.page.pullrequests.PullRequestListPage;
import io.onedev.server.web.page.simple.error.PageNotFoundErrorPage;
-import io.onedev.server.web.page.simple.security.*;
+import io.onedev.server.web.page.simple.security.CreateUserFromInvitationPage;
+import io.onedev.server.web.page.simple.security.EmailAddressVerificationPage;
+import io.onedev.server.web.page.simple.security.LoginPage;
+import io.onedev.server.web.page.simple.security.LogoutPage;
+import io.onedev.server.web.page.simple.security.OAuthCallbackPage;
+import io.onedev.server.web.page.simple.security.PasswordResetPage;
+import io.onedev.server.web.page.simple.security.SignUpPage;
import io.onedev.server.web.page.simple.serverinit.ServerInitPage;
-import io.onedev.server.web.resource.*;
-import org.apache.wicket.core.request.mapper.ResourceMapper;
-import org.apache.wicket.markup.html.pages.BrowserInfoPage;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.request.IRequestMapper;
-import org.apache.wicket.request.mapper.CompoundRequestMapper;
+import io.onedev.server.web.page.test.TestPage;
+import io.onedev.server.web.resource.AgentLibResourceReference;
+import io.onedev.server.web.resource.AgentLogResourceReference;
+import io.onedev.server.web.resource.AgentResourceReference;
+import io.onedev.server.web.resource.ArchiveResourceReference;
+import io.onedev.server.web.resource.ArtifactResourceReference;
+import io.onedev.server.web.resource.AttachmentResourceReference;
+import io.onedev.server.web.resource.BuildLogResourceReference;
+import io.onedev.server.web.resource.RawBlobResourceReference;
+import io.onedev.server.web.resource.ServerLogResourceReference;
+import io.onedev.server.web.resource.SiteFileResourceReference;
+import io.onedev.server.web.resource.SpriteResourceReference;
public class BaseUrlMapper extends CompoundRequestMapper {
@@ -157,6 +200,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {
addResources();
addHelpPages();
addErrorPages();
+ add(new BasePageMapper("~test", TestPage.class));
}
private void addHelpPages() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
index 51413af4b7..0e64106e3e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
@@ -1,6 +1,19 @@
package io.onedev.server.web.page.project.blob.render.renderers.markdown;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+import org.apache.wicket.model.Model;
+import org.jetbrains.annotations.Nullable;
+
import com.google.common.collect.Sets;
+
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
@@ -8,9 +21,16 @@ import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.markdown.MarkdownManager;
-import io.onedev.server.model.*;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ContentDetector;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.Similarities;
import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.component.markdown.AtWhoReferenceSupport;
@@ -18,19 +38,7 @@ import io.onedev.server.web.component.markdown.MarkdownEditor;
import io.onedev.server.web.component.markdown.UserMentionSupport;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.apache.wicket.model.Model;
-import org.jetbrains.annotations.Nullable;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-@SuppressWarnings("serial")
class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
private final BlobRenderContext context;
@@ -108,15 +116,23 @@ class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
@Override
public List<PullRequest> queryPullRequests(Project project, String query, int count) {
- return OneDev.getInstance(PullRequestManager.class).query(project, query, count);
+ if (SecurityUtils.canReadCode(project)) {
+ var requestQuery = new PullRequestQuery(new io.onedev.server.search.entity.pullrequest.FuzzyCriteria(query));
+ return OneDev.getInstance(PullRequestManager.class).query(project, requestQuery, false, 0, count);
+ } else {
+ return new ArrayList<>();
+ }
}
-
+
@Override
public List<Issue> queryIssues(Project project, String query, int count) {
- if (SecurityUtils.canAccessProject(project))
- return OneDev.getInstance(IssueManager.class).query(null, project, query, count);
- else
+ if (SecurityUtils.canAccessProject(project)) {
+ var projectScope = new ProjectScope(project, false, false);
+ var issueQuery = new IssueQuery(new io.onedev.server.search.entity.issue.FuzzyCriteria(query));
+ return OneDev.getInstance(IssueManager.class).query(projectScope, issueQuery, false, 0, count);
+ } else {
return new ArrayList<>();
+ }
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index fee87f1bf7..f45898c60f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -1,12 +1,13 @@
package io.onedev.server.web.page.test;
-import io.onedev.server.web.page.base.BasePage;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.server.web.page.base.BasePage;
+
public class TestPage extends BasePage {
public TestPage(PageParameters params) {
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index 86142f21f5..33f7b29ec3 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -1,6 +1,29 @@
package io.onedev.server.web.util;
+import static java.util.Collections.sort;
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.comparingInt;
+import static java.util.stream.Collectors.toList;
+
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+
import com.google.common.base.Preconditions;
+
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.LinearRange;
@@ -11,16 +34,34 @@ import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.JobVariable;
import io.onedev.server.buildspec.param.spec.ParamSpec;
-import io.onedev.server.entitymanager.*;
+import io.onedev.server.entitymanager.AgentAttributeManager;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.BuildMetricManager;
+import io.onedev.server.entitymanager.GroupManager;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.LabelSpecManager;
+import io.onedev.server.entitymanager.LinkSpecManager;
+import io.onedev.server.entitymanager.PackManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.git.GitUtils;
-import io.onedev.server.model.*;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.model.support.build.JobProperty;
import io.onedev.server.model.support.build.JobSecret;
import io.onedev.server.pack.PackSupport;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.security.permission.BasePermission;
+import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.ProjectScopedQuery;
import io.onedev.server.util.ScriptContribution;
import io.onedev.server.util.facade.ProjectCache;
@@ -30,17 +71,6 @@ import io.onedev.server.util.interpolative.VariableInterpolator;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.xodus.CommitInfoManager;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-
-import javax.annotation.Nullable;
-import java.nio.file.Paths;
-import java.util.*;
-
-import static java.util.Collections.sort;
-import static java.util.Comparator.comparing;
-import static java.util.Comparator.comparingInt;
-import static java.util.stream.Collectors.toList;
public class SuggestionUtils {
@@ -359,12 +389,12 @@ public class SuggestionUtils {
public static List<InputSuggestion> suggestIssues(@Nullable Project project, String matchWith, int count) {
List<InputSuggestion> suggestions = new ArrayList<>();
var scopedQuery = ProjectScopedQuery.of(project, matchWith, '#', '-');
- if (scopedQuery != null) {
- if (SecurityUtils.canAccessProject(scopedQuery.getProject())) {
- for (Issue issue : OneDev.getInstance(IssueManager.class).query(null, scopedQuery.getProject(), scopedQuery.getQuery(), count)) {
- String title = Emojis.getInstance().apply(issue.getTitle());
- suggestions.add(new InputSuggestion(issue.getReference().toString(project), title, null));
- }
+ if (scopedQuery != null && SecurityUtils.canAccessProject(scopedQuery.getProject())) {
+ var projectScope = new ProjectScope(scopedQuery.getProject(), false, false);
+ var issueQuery = new IssueQuery(new io.onedev.server.search.entity.issue.FuzzyCriteria(scopedQuery.getQuery()));
+ for (var issue : OneDev.getInstance(IssueManager.class).query(projectScope, issueQuery, false, 0, count)) {
+ var title = Emojis.getInstance().apply(issue.getTitle());
+ suggestions.add(new InputSuggestion(issue.getReference().toString(project), title, null));
}
}
if (suggestions.isEmpty() && matchWith.length() == 0) {
@@ -379,13 +409,12 @@ public class SuggestionUtils {
public static List<InputSuggestion> suggestPullRequests(@Nullable Project project, String matchWith, int count) {
List<InputSuggestion> suggestions = new ArrayList<>();
var scopedQuery = ProjectScopedQuery.of(project, matchWith, '#', '-');
- if (scopedQuery != null) {
- if (SecurityUtils.canReadCode(scopedQuery.getProject())) {
- PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);
- for (PullRequest request: pullRequestManager.query(scopedQuery.getProject(), scopedQuery.getQuery(), count)) {
- String title = Emojis.getInstance().apply(request.getTitle());
- suggestions.add(new InputSuggestion(request.getReference().toString(project), title, null));
- }
+ if (scopedQuery != null && SecurityUtils.canReadCode(scopedQuery.getProject())) {
+ PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);
+ var requestQuery = new PullRequestQuery(new io.onedev.server.search.entity.pullrequest.FuzzyCriteria(scopedQuery.getQuery()));
+ for (var request: pullRequestManager.query(scopedQuery.getProject(), requestQuery, false, 0, count)) {
+ var title = Emojis.getInstance().apply(request.getTitle());
+ suggestions.add(new InputSuggestion(request.getReference().toString(project), title, null));
}
}
if (suggestions.isEmpty() && matchWith.length() == 0) {