Skip to content

The Unified and Autonomous Development Platform

chore: Refactor exception handling to avoid cluttering server log

Robin Shen6928384289de
diff --git a/server-core/src/main/java/io/onedev/server/ai/TodResource.java b/server-core/src/main/java/io/onedev/server/ai/TodResource.java
index b365b9089a..bf79f8f40d 100644
--- a/server-core/src/main/java/io/onedev/server/ai/TodResource.java
+++ b/server-core/src/main/java/io/onedev/server/ai/TodResource.java
@@ -31,13 +31,10 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.antlr.v4.runtime.misc.ParseCancellationException;
import org.apache.shiro.authz.UnauthenticatedException;
import org.apache.shiro.authz.UnauthorizedException;
import org.eclipse.jgit.lib.ObjectId;
import org.jspecify.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
@@ -122,8 +119,6 @@ import io.onedev.server.util.ProjectScope;
@Singleton
public class TodResource {
- private static final Logger logger = LoggerFactory.getLogger(TodResource.class);
-
@Inject
private SettingService settingService;
@@ -439,12 +434,7 @@ public class TodResource {
if (query != null) {
var option = new IssueQueryParseOption();
option.withCurrentUserCriteria(true);
- try {
- parsedQuery = IssueQuery.parse(projectContext.project, query, option, true);
- } catch (ParseCancellationException e) {
- logger.error("Error parsing query", e);
- throw new NotAcceptableException("Invalid issue query, check server log for details");
- }
+ parsedQuery = IssueQuery.parse(projectContext.project, query, option, true);
} else {
parsedQuery = new IssueQuery(null, new ArrayList<>());
}
@@ -505,13 +495,7 @@ public class TodResource {
if (count > RestConstants.MAX_PAGE_SIZE)
throw new NotAcceptableException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);
- EntityQuery<Project> parsedQuery;
- try {
- parsedQuery = ProjectQuery.parse(query);
- } catch (Exception e) {
- logger.error("Error parsing query", e);
- throw new NotAcceptableException("Invalid project query, check server log for details");
- }
+ var parsedQuery = ProjectQuery.parse(query);
var summaries = new ArrayList<Map<String, Object>>();
for (var project : projectService.query(subject, parsedQuery, true, offset, count))
@@ -813,16 +797,10 @@ public class TodResource {
throw new NotAcceptableException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);
EntityQuery<PullRequest> parsedQuery;
- if (query != null) {
- try {
- parsedQuery = PullRequestQuery.parse(projectContext.project, query, true);
- } catch (ParseCancellationException e) {
- logger.error("Error parsing query", e);
- throw new NotAcceptableException("Invalid pull request query, check server log for details");
- }
- } else {
+ if (query != null)
+ parsedQuery = PullRequestQuery.parse(projectContext.project, query, true);
+ else
parsedQuery = new PullRequestQuery();
- }
var summaries = new ArrayList<Map<String, Object>>();
for (var pullRequest : pullRequestService.query(subject, projectContext.project, parsedQuery, false, offset, count)) {
@@ -851,16 +829,10 @@ public class TodResource {
throw new NotAcceptableException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);
EntityQuery<Build> parsedQuery;
- if (query != null) {
- try {
- parsedQuery = BuildQuery.parse(projectContext.project, query, true, true);
- } catch (ParseCancellationException e) {
- logger.error("Error parsing query", e);
- throw new NotAcceptableException("Invalid build query, check server log for details");
- }
- } else {
+ if (query != null)
+ parsedQuery = BuildQuery.parse(projectContext.project, query, true, true);
+ else
parsedQuery = new BuildQuery();
- }
var summaries = new ArrayList<Map<String, Object>>();
for (var build : buildService.query(subject, projectContext.project, parsedQuery, false, offset, count)) {
diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/ParseCancellationExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/ParseCancellationExceptionHandler.java
new file mode 100644
index 0000000000..ad76a10d3a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/exception/handler/ParseCancellationExceptionHandler.java
@@ -0,0 +1,18 @@
+package io.onedev.server.exception.handler;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.antlr.v4.runtime.misc.ParseCancellationException;
+
+import io.onedev.server.exception.HttpResponse;
+
+public class ParseCancellationExceptionHandler extends AbstractExceptionHandler<ParseCancellationException> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public HttpResponse getResponse(ParseCancellationException exception) {
+ return new HttpResponse(HttpServletResponse.SC_NOT_ACCEPTABLE, "Invalid query");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/RecognitionExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/RecognitionExceptionHandler.java
new file mode 100644
index 0000000000..a5bc588e12
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/exception/handler/RecognitionExceptionHandler.java
@@ -0,0 +1,18 @@
+package io.onedev.server.exception.handler;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.antlr.v4.runtime.RecognitionException;
+
+import io.onedev.server.exception.HttpResponse;
+
+public class RecognitionExceptionHandler extends AbstractExceptionHandler<RecognitionException> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public HttpResponse getResponse(RecognitionException exception) {
+ return new HttpResponse(HttpServletResponse.SC_NOT_ACCEPTABLE, "Invalid query");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/AgentResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/AgentResource.java
index 3ee5b519c7..64d0c66115 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/AgentResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/AgentResource.java
@@ -7,7 +7,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
-import javax.ws.rs.NotAcceptableException;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
@@ -20,13 +19,13 @@ import org.apache.shiro.authz.UnauthorizedException;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.data.migration.VersionedXmlDoc;
-import io.onedev.server.service.AgentAttributeService;
-import io.onedev.server.service.AgentService;
-import io.onedev.server.service.AuditService;
import io.onedev.server.model.Agent;
import io.onedev.server.rest.annotation.Api;
import io.onedev.server.search.entity.agent.AgentQuery;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.AgentAttributeService;
+import io.onedev.server.service.AgentService;
+import io.onedev.server.service.AuditService;
@Path("/agents")
@Consumes(MediaType.APPLICATION_JSON)
@@ -74,12 +73,7 @@ public class AgentResource {
if (!SecurityUtils.isAdministrator())
throw new UnauthorizedException();
- AgentQuery parsedQuery;
- try {
- parsedQuery = AgentQuery.parse(query, false);
- } catch (Exception e) {
- throw new NotAcceptableException("Error parsing query", e);
- }
+ var parsedQuery = AgentQuery.parse(query, false);
return agentService.query(parsedQuery, offset, count);
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java
index 397c802e3d..7cec8062c2 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java
@@ -134,13 +134,8 @@ public class BuildResource {
if (!SecurityUtils.isAdministrator(subject) && count > RestConstants.MAX_PAGE_SIZE)
throw new NotAcceptableException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);
- BuildQuery parsedQuery;
- try {
- parsedQuery = BuildQuery.parse(null, query, true, true);
- } catch (Exception e) {
- throw new NotAcceptableException("Error parsing query", e);
- }
-
+ var parsedQuery = BuildQuery.parse(null, query, true, true);
+
return buildService.query(subject, null, parsedQuery, false, offset, count);
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java
index 7d5d755a8a..adc63ca732 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java
@@ -277,13 +277,8 @@ public class IssueResource {
if (!SecurityUtils.isAdministrator(subject) && count > RestConstants.MAX_PAGE_SIZE)
throw new NotAcceptableException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);
- IssueQuery parsedQuery;
- try {
- IssueQueryParseOption option = new IssueQueryParseOption().withCurrentUserCriteria(true);
- parsedQuery = IssueQuery.parse(null, query, option, true);
- } catch (Exception e) {
- throw new NotAcceptableException("Error parsing query", e);
- }
+ IssueQueryParseOption option = new IssueQueryParseOption().withCurrentUserCriteria(true);
+ var parsedQuery = IssueQuery.parse(null, query, option, true);
var issues = new ArrayList<Map<String, Object>>();
for (var issue: issueService.query(subject, null, parsedQuery, false, offset, count)) {
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.java
index 18be799d8d..2d81ab1797 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.java
@@ -89,12 +89,7 @@ public class PackResource {
if (!SecurityUtils.isAdministrator(subject) && count > RestConstants.MAX_PAGE_SIZE)
throw new NotAcceptableException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);
- PackQuery parsedQuery;
- try {
- parsedQuery = PackQuery.parse(null, query, true);
- } catch (Exception e) {
- throw new NotAcceptableException("Error parsing query", e);
- }
+ var parsedQuery = PackQuery.parse(null, query, true);
return packService.query(subject, null, parsedQuery, false, offset, count);
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
index 36fe9e3e95..93d253c59a 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
@@ -210,12 +210,7 @@ public class ProjectResource {
if (!SecurityUtils.isAdministrator(subject) && count > RestConstants.MAX_PAGE_SIZE)
throw new NotAcceptableException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);
- ProjectQuery parsedQuery;
- try {
- parsedQuery = ProjectQuery.parse(query);
- } catch (Exception e) {
- throw new NotAcceptableException("Error parsing query", e);
- }
+ var parsedQuery = ProjectQuery.parse(query);
return projectService.query(subject, parsedQuery, false, offset, count).stream()
.map(ProjectData::from)
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
index 1be9bbfe6d..692a1eecc9 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java
@@ -238,12 +238,7 @@ public class PullRequestResource {
if (!SecurityUtils.isAdministrator(subject) && count > RestConstants.MAX_PAGE_SIZE)
throw new NotAcceptableException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);
- PullRequestQuery parsedQuery;
- try {
- parsedQuery = PullRequestQuery.parse(null, query, true);
- } catch (Exception e) {
- throw new NotAcceptableException("Error parsing query", e);
- }
+ var parsedQuery = PullRequestQuery.parse(null, query, true);
return pullRequestService.query(subject, null, parsedQuery, false, offset, count);
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java
index 067c0a5ba4..3ea000bd55 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java
@@ -275,12 +275,7 @@ public class RepositoryResource {
if (count > MAX_COMMITS)
throw new NotAcceptableException("Count should not be greater than " + MAX_COMMITS);
- CommitQuery parsedQuery;
- try {
- parsedQuery = CommitQuery.parse(project, query, true);
- } catch (Exception e) {
- throw new NotAcceptableException("Error parsing query", e);
- }
+ var parsedQuery = CommitQuery.parse(project, query, true);
RevListOptions options = new RevListOptions();
options.ignoreCase(true);
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/WorkspaceResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/WorkspaceResource.java
index ef692de40d..6115bb5e99 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/WorkspaceResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/WorkspaceResource.java
@@ -90,12 +90,7 @@ public class WorkspaceResource {
if (!SecurityUtils.isAdministrator(subject) && count > RestConstants.MAX_PAGE_SIZE)
throw new NotAcceptableException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);
- WorkspaceQuery parsedQuery;
- try {
- parsedQuery = WorkspaceQuery.parse(null, query, true);
- } catch (Exception e) {
- throw new NotAcceptableException("Error parsing query", e);
- }
+ var parsedQuery = WorkspaceQuery.parse(null, query, true);
return workspaceService.query(subject, null, parsedQuery, offset, count);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java
index 829535afd0..8a97151816 100644
--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java
@@ -4,9 +4,9 @@ import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.service.BuildParamService;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.BuildMetric;
-import io.onedev.server.search.entity.EntityQuery;
import org.antlr.v4.runtime.*;
import org.jspecify.annotations.Nullable;
@@ -75,7 +75,7 @@ public class BuildMetricQuery implements Serializable {
@Override
public BuildMetricCriteria visitFieldOperatorCriteria(FieldOperatorCriteriaContext ctx) {
- String fieldName = EntityQuery.getValue(ctx.Quoted().getText());
+ String fieldName = QueryUtils.getValue(ctx.Quoted().getText());
int operator = ctx.operator.getType();
checkField(project, fieldName, operator);
if (fieldName.equals(NAME_PULL_REQUEST))
@@ -86,13 +86,13 @@ public class BuildMetricQuery implements Serializable {
@Override
public BuildMetricCriteria visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {
- String fieldName = EntityQuery.getValue(ctx.criteriaField.getText());
+ String fieldName = QueryUtils.getValue(ctx.criteriaField.getText());
int operator = ctx.operator.getType();
checkField(project, fieldName, operator);
var criterias = new ArrayList<BuildMetricCriteria>();
for (var quoted: ctx.criteriaValue.Quoted()) {
- String value = EntityQuery.getValue(quoted.getText());
+ String value = QueryUtils.getValue(quoted.getText());
if (operator == Is || operator == IsNot) {
switch (fieldName) {
case BuildMetric.NAME_REPORT:
@@ -119,7 +119,7 @@ public class BuildMetricQuery implements Serializable {
var criterias = new ArrayList<BuildMetricCriteria>();
for (var quoted: ctx.criteriaValue.Quoted()) {
int operator = ctx.operator.getType();
- String value = EntityQuery.getValue(quoted.getText());
+ String value = QueryUtils.getValue(quoted.getText());
if (operator == Since || operator == Until)
criterias.add(new DateCriteria(value, operator));
else
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/DateCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/DateCriteria.java
index ada466e84a..f1d6ce2d92 100644
--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/DateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/DateCriteria.java
@@ -9,7 +9,7 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
-import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.QueryUtils;
public class DateCriteria extends BuildMetricCriteria {
@@ -22,7 +22,7 @@ public class DateCriteria extends BuildMetricCriteria {
private final String value;
public DateCriteria(String value, int operator) {
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
this.operator = operator;
this.value = value;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
index e6d4ea5976..03505814e4 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
@@ -11,9 +11,9 @@ import org.eclipse.jgit.lib.PersonIdent;
import com.google.common.base.Preconditions;
-import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
@@ -52,7 +52,7 @@ public abstract class PersonCriteria extends CommitCriteria {
persons.add("<" + it + ">");
});
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
} else if (value.startsWith("@")) {
String userName = value.substring(1);
@@ -76,7 +76,7 @@ public abstract class PersonCriteria extends CommitCriteria {
if (value == null) { // authored by me
User user = User.get();
if (user == null) {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
} else if (user.getVerifiedEmailAddresses().stream()
.anyMatch(it-> it.equalsIgnoreCase(personEmail))) {
return true;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
index 79fbd5e58d..fb4faa3dd4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
@@ -2,54 +2,17 @@ package io.onedev.server.search.entity;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
-import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import javax.persistence.criteria.Path;
-import javax.validation.ValidationException;
-
import org.jspecify.annotations.Nullable;
-import com.google.common.base.Splitter;
-
-import io.onedev.commons.codeassist.FenceAware;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.OneDev;
-import io.onedev.server.entityreference.BuildReference;
-import io.onedev.server.entityreference.IssueReference;
-import io.onedev.server.entityreference.PullRequestReference;
-import io.onedev.server.exception.NotAcceptableException;
-import io.onedev.server.exception.NotFoundException;
import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Group;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Iteration;
-import io.onedev.server.model.LabelSpec;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.service.BuildService;
-import io.onedev.server.service.GroupService;
-import io.onedev.server.service.IssueService;
-import io.onedev.server.service.IterationService;
-import io.onedev.server.service.LabelSpecService;
-import io.onedev.server.service.ProjectService;
-import io.onedev.server.service.PullRequestService;
-import io.onedev.server.service.SettingService;
-import io.onedev.server.service.UserService;
-import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.ProjectScopedCommit;
-import io.onedev.server.util.ProjectScopedRevision;
import io.onedev.server.util.criteria.Criteria;
public abstract class EntityQuery<T extends AbstractEntity> implements Serializable {
private static final long serialVersionUID = 1L;
-
- private static final Pattern INSIDE_QUOTE = Pattern.compile("\"([^\"\\\\]|\\\\.)*");
private Criteria<T> criteria;
@@ -92,156 +55,6 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
this.baseSorts = baseSorts;
}
- public static String getValue(String token) {
- return StringUtils.unescape(FenceAware.unfence(token));
- }
-
- public static int getIntValue(String value) {
- try {
- return Integer.parseInt(value);
- } catch (NumberFormatException e) {
- throw new NotAcceptableException("Invalid number: " + value);
- }
- }
-
- public static float getFloatValue(String value) {
- try {
- return Float.parseFloat(value);
- } catch (NumberFormatException e) {
- throw new NotAcceptableException("Invalid decimal: " + value);
- }
- }
-
- public static LabelSpec getLabelSpec(String labelName) {
- var labelSpec = OneDev.getInstance(LabelSpecService.class).find(labelName);
- if (labelSpec != null)
- return labelSpec;
- else
- throw new NotFoundException("Undefined label: " + labelName);
- }
-
- public static int getWorkingPeriodValue(String value) {
- try {
- var timeTrackingSetting = OneDev.getInstance(SettingService.class).getIssueSetting().getTimeTrackingSetting();
- return timeTrackingSetting.parseWorkingPeriod(value);
- } catch (ValidationException e) {
- throw new NotAcceptableException("Invalid working period: " + value);
- }
- }
-
- public static long getLongValue(String value) {
- try {
- return Long.parseLong(value);
- } catch (NumberFormatException e) {
- throw new NotAcceptableException("Invalid number: " + value);
- }
- }
-
- public static User getUser(String loginName) {
- User user = OneDev.getInstance(UserService.class).findByName(loginName);
- if (user == null)
- throw new NotFoundException("Unable to find user with login: " + loginName);
- return user;
- }
-
- public static Group getGroup(String groupName) {
- Group group = OneDev.getInstance(GroupService.class).find(groupName);
- if (group == null)
- throw new NotFoundException("Unable to find group: " + groupName);
- return group;
- }
-
- public static Project getProject(String projectPath) {
- Project project = OneDev.getInstance(ProjectService.class).findByPath(projectPath);
- if (project == null)
- throw new NotFoundException("Unable to find project '" + projectPath + "'");
- return project;
- }
-
- public static boolean getBooleanValue(String value) {
- if (value.equals("true"))
- return true;
- else if (value.equals("false"))
- return false;
- else
- throw new NotAcceptableException("Invalid boolean: " + value);
- }
-
- public static Date getDateValue(String value) {
- Date dateValue = DateUtils.parseRelaxed(value);
- if (dateValue == null)
- throw new NotAcceptableException("Unrecognized date: " + value);
- return dateValue;
- }
-
- public static ProjectScopedCommit getCommitId(@Nullable Project project, String value) {
- if (project != null && !value.contains(":"))
- value = project.getPath() + ":" + value;
- ProjectScopedCommit commitId = ProjectScopedCommit.from(value);
- if (commitId != null && commitId.getCommitId() != null)
- return commitId;
- else
- throw new NotFoundException("Unable to find revision: " + value);
- }
-
- public static ProjectScopedRevision getRevision(@Nullable Project project, String value) {
- if (project != null && !value.contains(":"))
- value = project.getPath() + ":" + value;
- ProjectScopedRevision revision = ProjectScopedRevision.from(value);
- if (revision != null)
- return revision;
- else
- throw new NotFoundException("Unable to find revision: " + value);
- }
-
- public static Issue getIssue(@Nullable Project project, String value) {
- var reference = IssueReference.of(value, project);
- var issueService = OneDev.getInstance(IssueService.class);
- var issue = issueService.find(reference.getProject(), reference.getNumber());
- if (issue != null)
- return issue.resolveMovedTo();
- else
- throw new NotFoundException("Unable to find issue: " + value);
- }
-
- public static PullRequest getPullRequest(@Nullable Project project, String value) {
- var reference = PullRequestReference.of(value, project);
- var pullRequest = OneDev.getInstance(PullRequestService.class).find(reference.getProject(), reference.getNumber());
- if (pullRequest != null)
- return pullRequest;
- else
- throw new NotFoundException("Unable to find pull request: " + value);
- }
-
- public static Build getBuild(@Nullable Project project, String value) {
- var reference = BuildReference.of(value, project);
- var build = OneDev.getInstance(BuildService.class).find(reference.getProject(), reference.getNumber());
- if (build != null)
- return build;
- else
- throw new NotFoundException("Unable to find build: " + value);
- }
-
- public static Long getNumber(String value) {
- if (value.startsWith("#"))
- value = value.substring(1);
- try {
- return Long.parseLong(value);
- } catch (NumberFormatException e) {
- throw new NotAcceptableException("Invalid number: " + value);
- }
- }
-
- public static Iteration getIteration(@Nullable Project project, String value) {
- if (project != null && !value.contains(":"))
- value = project.getPath() + ":" + value;
- Iteration iteration = OneDev.getInstance(IterationService.class).findInHierarchy(value);
- if (iteration != null)
- return iteration;
- else
- throw new NotFoundException("Unable to find iteration: " + value);
- }
-
public boolean matches(T entity) {
return getCriteria() == null || getCriteria().matches(entity);
}
@@ -261,18 +74,6 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
return toStringValue;
}
- public static <T> Path<T> getPath(Path<?> root, String pathName) {
- int index = pathName.indexOf('.');
- if (index != -1) {
- Path<T> path = root.get(pathName.substring(0, index));
- for (String field: Splitter.on(".").split(pathName.substring(index+1)))
- path = path.get(field);
- return path;
- } else {
- return root.get(pathName);
- }
- }
-
public EntityQuery<T> onMoveProject(String oldPath, String newPath) {
if (getCriteria() != null)
getCriteria().onMoveProject(oldPath, newPath);
@@ -286,8 +87,4 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
return false;
}
- public static boolean isInsideQuote(String value) {
- return INSIDE_QUOTE.matcher(value.trim()).matches();
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java
index 235e66f80a..d657647d9e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java
@@ -15,6 +15,7 @@ import static io.onedev.server.search.entity.agent.AgentQueryParser.IsNot;
import static io.onedev.server.search.entity.agent.AgentQueryParser.Offline;
import static io.onedev.server.search.entity.agent.AgentQueryParser.Online;
import static io.onedev.server.search.entity.agent.AgentQueryParser.Paused;
+import static io.onedev.server.util.QueryUtils.getValue;
import java.util.ArrayList;
import java.util.List;
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 6c100d547f..cdd7976004 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
@@ -2,10 +2,10 @@ 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.getDateValue;
-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 static io.onedev.server.util.QueryUtils.getDateValue;
+import static io.onedev.server.util.QueryUtils.getPath;
import java.util.Date;
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 ae3ee21895..451eb4a829 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
@@ -2,9 +2,10 @@ 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 static io.onedev.server.util.QueryUtils.getDateValue;
+import static io.onedev.server.util.QueryUtils.getPath;
import java.util.Date;
@@ -16,7 +17,6 @@ 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;
@@ -29,7 +29,7 @@ public class NotUsedSinceCriteria extends Criteria<Agent> {
private final String value;
public NotUsedSinceCriteria(String value) {
- date = EntityQuery.getDateValue(value);
+ date = getDateValue(value);
this.value = value;
}
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 7e0eb0e3d3..dce60bb908 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
@@ -10,8 +10,8 @@ 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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class RanBuildCriteria extends Criteria<Agent> {
@@ -23,7 +23,7 @@ public class RanBuildCriteria extends Criteria<Agent> {
private final String value;
public RanBuildCriteria(String value) {
- build = EntityQuery.getBuild(null, value);
+ build = QueryUtils.getBuild(null, value);
this.value = value;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
index 789f622684..0613a48e75 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
@@ -36,6 +36,11 @@ import static io.onedev.server.search.entity.build.BuildQueryParser.SubmittedByM
import static io.onedev.server.search.entity.build.BuildQueryParser.Successful;
import static io.onedev.server.search.entity.build.BuildQueryParser.TimedOut;
import static io.onedev.server.search.entity.build.BuildQueryParser.Waiting;
+import static io.onedev.server.util.QueryUtils.getCommitId;
+import static io.onedev.server.util.QueryUtils.getLabelSpec;
+import static io.onedev.server.util.QueryUtils.getNumber;
+import static io.onedev.server.util.QueryUtils.getUser;
+import static io.onedev.server.util.QueryUtils.getValue;
import java.util.ArrayList;
import java.util.Collection;
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 322cde55f9..95cf907b89 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.build;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
@@ -25,7 +26,7 @@ public class CancelledByMeCriteria extends Criteria<Build> {
Path<User> attribute = from.get(Build.PROP_CANCELLER);
return builder.equal(attribute, User.get());
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
}
@@ -34,7 +35,7 @@ public class CancelledByMeCriteria extends Criteria<Build> {
if (User.get() != null)
return User.get().equals(build.getCanceller());
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
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 71dceca057..770b7db07b 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
@@ -12,6 +12,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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class CommitCriteria extends Criteria<Build> {
@@ -32,8 +33,8 @@ public class CommitCriteria extends Criteria<Build> {
@Override
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);
+ Path<?> projectAttribute = QueryUtils.getPath(from, Build.PROP_PROJECT);
+ Path<?> commitAttribute = QueryUtils.getPath(from, Build.PROP_COMMIT_HASH);
var predicate = builder.and(
builder.equal(projectAttribute, project),
builder.equal(commitAttribute, commitId.name()));
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java
index 5ed1774b1f..421406eaec 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
@@ -11,8 +11,8 @@ import javax.persistence.criteria.Predicate;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class DependenciesOfCriteria extends Criteria<Build> {
@@ -24,7 +24,7 @@ public class DependenciesOfCriteria extends Criteria<Build> {
private final String value;
public DependenciesOfCriteria(@Nullable Project project, String value) {
- build = EntityQuery.getBuild(project, value);
+ build = QueryUtils.getBuild(project, value);
this.value = value;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java
index 6070f34a1d..c7f9cd6958 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
@@ -11,8 +11,8 @@ import javax.persistence.criteria.Predicate;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class DependsOnCriteria extends Criteria<Build> {
@@ -24,7 +24,7 @@ public class DependsOnCriteria extends Criteria<Build> {
private final String value;
public DependsOnCriteria(@Nullable Project project, String value) {
- build = EntityQuery.getBuild(project, value);
+ build = QueryUtils.getBuild(project, value);
this.value = value;
}
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 983bb99c7d..90dbd5a1d6 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
@@ -10,8 +10,8 @@ import javax.persistence.criteria.Path;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class FinishDateCriteria extends Criteria<Build> {
@@ -25,7 +25,7 @@ public class FinishDateCriteria extends Criteria<Build> {
private final String value;
public FinishDateCriteria(String value, int operator) {
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
this.operator = operator;
this.value = value;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
index fa9586b286..29a0612126 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
@@ -20,8 +20,8 @@ import io.onedev.server.git.service.GitService;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.xodus.CommitInfoService;
@@ -34,7 +34,7 @@ public class FixedIssueCriteria extends Criteria<Build> {
private final String value;
public FixedIssueCriteria(@Nullable Project project, String value) {
- issue = EntityQuery.getIssue(project, value);
+ issue = QueryUtils.getIssue(project, value);
this.value = value;
}
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 05abb98581..884b52ccb4 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
@@ -10,8 +10,8 @@ import javax.persistence.criteria.Path;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class PendingDateCriteria extends Criteria<Build> {
@@ -25,7 +25,7 @@ public class PendingDateCriteria extends Criteria<Build> {
private final String value;
public PendingDateCriteria(String value, int operator) {
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
this.operator = operator;
this.value = value;
}
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 058bd72de7..f83016b545 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
@@ -10,8 +10,8 @@ import javax.persistence.criteria.Predicate;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class PullRequestCriteria extends Criteria<Build> {
@@ -25,7 +25,7 @@ public class PullRequestCriteria extends Criteria<Build> {
private final int operator;
public PullRequestCriteria(@Nullable Project project, String value, int operator) {
- request = EntityQuery.getPullRequest(project, value);
+ request = QueryUtils.getPullRequest(project, value);
this.value = value;
this.operator = operator;
}
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 bce19b7743..12ad75f726 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
@@ -10,8 +10,8 @@ import javax.persistence.criteria.Path;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class RunningDateCriteria extends Criteria<Build> {
@@ -26,7 +26,7 @@ public class RunningDateCriteria extends Criteria<Build> {
public RunningDateCriteria(String value, int operator) {
this.operator = operator;
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
this.value = value;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
index a6667995ad..8df9401a75 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
@@ -10,8 +10,8 @@ import javax.persistence.criteria.Path;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class SubmitDateCriteria extends Criteria<Build> {
@@ -25,7 +25,7 @@ public class SubmitDateCriteria extends Criteria<Build> {
private final String value;
public SubmitDateCriteria(String value, int operator) {
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
this.operator = operator;
this.value = value;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
index 41e1d037db..79aad71519 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.build;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
@@ -25,7 +26,7 @@ public class SubmittedByMeCriteria extends SubmittedByCriteria {
Path<User> attribute = from.get(Build.PROP_SUBMITTER);
return builder.equal(attribute, User.get());
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
}
@@ -39,7 +40,7 @@ public class SubmittedByMeCriteria extends SubmittedByCriteria {
if (User.get() != null)
return User.get().equals(build.getSubmitter());
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
index 97a9032c79..e363b726e4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
@@ -25,6 +25,11 @@ import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.
import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.RepliedByMe;
import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.Resolved;
import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.Unresolved;
+import static io.onedev.server.util.QueryUtils.getCommitId;
+import static io.onedev.server.util.QueryUtils.getDateValue;
+import static io.onedev.server.util.QueryUtils.getIntValue;
+import static io.onedev.server.util.QueryUtils.getUser;
+import static io.onedev.server.util.QueryUtils.getValue;
import java.util.ArrayList;
import java.util.Date;
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 de02445986..847b3f2f82 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.codecomment;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
@@ -25,7 +26,7 @@ public class CreatedByMeCriteria extends CreatedByCriteria {
Path<?> attribute = from.get(CodeComment.PROP_USER);
return builder.equal(attribute, User.get());
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
}
@@ -39,7 +40,7 @@ public class CreatedByMeCriteria extends CreatedByCriteria {
if (User.get() != null)
return User.get().equals(comment.getUser());
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
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 54035d328b..20bf535b25 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
@@ -12,6 +12,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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class LastActivityDateCriteria extends Criteria<CodeComment> {
@@ -40,7 +41,7 @@ public class LastActivityDateCriteria extends Criteria<CodeComment> {
@Override
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);
+ Path<Date> attribute = QueryUtils.getPath(from, CodeComment.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE);
if (operator == CodeCommentQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
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 14860d56f6..1ebced43d0 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
@@ -2,7 +2,6 @@ package io.onedev.server.search.entity.codecomment;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,7 +9,9 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
-import io.onedev.commons.utils.ExplicitException;
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentMention;
import io.onedev.server.model.User;
@@ -32,7 +33,7 @@ public class MentionedMeCriteria extends Criteria<CodeComment> {
builder.equal(mention.get(CodeCommentMention.PROP_USER), User.get())));
return builder.exists(mentionQuery);
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
}
@@ -41,7 +42,7 @@ public class MentionedMeCriteria extends Criteria<CodeComment> {
if (User.get() != null)
return comment.getMentions().stream().anyMatch(it->it.getUser().equals(User.get()));
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
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 e79a27e9e2..a093c264b6 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
@@ -13,6 +13,7 @@ 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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class OnCommitCriteria extends Criteria<CodeComment> {
@@ -30,8 +31,8 @@ public class OnCommitCriteria extends Criteria<CodeComment> {
@Override
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);
+ Path<?> projectAttribute = QueryUtils.getPath(from, CodeComment.PROP_PROJECT);
+ Path<?> commitAttribute = QueryUtils.getPath(from, CodeComment.PROP_MARK + "." + Mark.PROP_COMMIT_HASH);
return builder.and(
builder.equal(projectAttribute, project),
builder.equal(commitAttribute, commitId.name()));
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
index 2fb7444314..66896cb3c8 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
@@ -11,6 +11,7 @@ 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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class PathCriteria extends Criteria<CodeComment> {
@@ -28,7 +29,7 @@ public class PathCriteria extends Criteria<CodeComment> {
@Override
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);
+ Path<String> attribute = QueryUtils.getPath(from, CodeComment.PROP_MARK + "." + Mark.PROP_PATH);
String normalized = value.toLowerCase().replace('*', '%');
if (normalized.endsWith("/"))
normalized += "%";
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java
index e03a3c19ea..8c4b9fce68 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
@@ -2,7 +2,6 @@ package io.onedev.server.search.entity.codecomment;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,7 +9,9 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
-import io.onedev.commons.utils.ExplicitException;
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.User;
@@ -32,7 +33,7 @@ public class RepliedByMeCriteria extends Criteria<CodeComment> {
builder.equal(reply.get(CodeCommentReply.PROP_USER), User.get())));
return builder.exists(replyQuery);
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
}
@@ -41,7 +42,7 @@ public class RepliedByMeCriteria extends Criteria<CodeComment> {
if (User.get() != null)
return comment.getReplies().stream().anyMatch(it->it.getUser().equals(User.get()));
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
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 5df3e68999..6fe771519b 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
@@ -2,7 +2,6 @@ package io.onedev.server.search.entity.issue;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,7 +9,9 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
-import io.onedev.commons.utils.ExplicitException;
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.User;
@@ -32,7 +33,7 @@ public class CommentedByMeCriteria extends Criteria<Issue> {
builder.equal(comment.get(IssueComment.PROP_USER), User.get())));
return builder.exists(commentQuery);
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
}
@@ -41,7 +42,7 @@ public class CommentedByMeCriteria extends Criteria<Issue> {
if (User.get() != null)
return issue.getComments().stream().anyMatch(it->it.getUser().equals(User.get()));
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java
index a8fd8a6a74..4f77151e03 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java
@@ -10,8 +10,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
import io.onedev.server.model.Project;
-import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.ProjectScopedCommit;
+import io.onedev.server.util.QueryUtils;
public class CommitFieldCriteria extends FieldCriteria {
@@ -34,7 +34,7 @@ public class CommitFieldCriteria extends FieldCriteria {
private ProjectScopedCommit getCommit() {
if (commit == null)
- commit = EntityQuery.getCommitId(project, value);
+ commit = QueryUtils.getCommitId(project, value);
return commit;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
index ba7c17d193..24f968629e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
-import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.QueryUtils;
public class DateFieldCriteria extends FieldCriteria {
@@ -22,7 +22,7 @@ public class DateFieldCriteria extends FieldCriteria {
public DateFieldCriteria(String name, String value, int operator) {
super(name);
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
this.value = value;
this.operator = operator;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
index ac11881c65..b3acb0c076 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
@@ -1,19 +1,5 @@
package io.onedev.server.search.entity.issue;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.*;
-import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;
-import io.onedev.server.model.support.issue.field.spec.CommitField;
-import io.onedev.server.model.support.issue.field.spec.PullRequestChoiceField;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.ProjectScopedCommit;
-import io.onedev.server.util.criteria.Criteria;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-
import static io.onedev.server.web.translation.Translation._T;
import java.nio.channels.IllegalSelectorException;
@@ -23,6 +9,25 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.exception.NotAcceptableException;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueField;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;
+import io.onedev.server.model.support.issue.field.spec.CommitField;
+import io.onedev.server.model.support.issue.field.spec.PullRequestChoiceField;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.ProjectScopedCommit;
+import io.onedev.server.util.criteria.Criteria;
+
public class FieldOperatorCriteria extends FieldCriteria {
private static final long serialVersionUID = 1L;
@@ -49,12 +54,12 @@ public class FieldOperatorCriteria extends FieldCriteria {
if (User.get() != null)
return builder.equal(valueAttribute, User.get().getName());
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
} else if (operator == IssueQueryLexer.IsNotMe) {
if (User.get() != null) {
return builder.not(builder.equal(valueAttribute, User.get().getName()));
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
} else if (operator == IssueQueryLexer.IsCurrent) {
if (getFieldSpec() instanceof BuildChoiceField) {
@@ -127,7 +132,7 @@ public class FieldOperatorCriteria extends FieldCriteria {
else
return Objects.equals(fieldValue, userName);
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
} else if (operator == IssueQueryLexer.IsCurrent) {
if (getFieldSpec() instanceof BuildChoiceField) {
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 06024f7274..e773aed26d 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
@@ -23,9 +23,9 @@ import io.onedev.server.git.service.GitService;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class FixedBetweenCriteria extends Criteria<Issue> {
@@ -70,10 +70,10 @@ public class FixedBetweenCriteria extends Criteria<Issue> {
private static ProjectScopedCommit getCommitId(@Nullable Project project, int type, String value) {
if (type == IssueQueryLexer.Build) {
- Build build = EntityQuery.getBuild(project, value);
+ Build build = QueryUtils.getBuild(project, value);
return new ProjectScopedCommit(build.getProject(), build.getCommitId());
} else {
- return EntityQuery.getCommitId(project, value);
+ return QueryUtils.getCommitId(project, value);
}
}
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 874b00cd2f..d73c3199e5 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
@@ -11,8 +11,8 @@ import javax.persistence.criteria.Predicate;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class FixedInBuildCriteria extends Criteria<Issue> {
@@ -38,7 +38,7 @@ public class FixedInBuildCriteria extends Criteria<Issue> {
private Build getBuild() {
if (build == null)
- build = EntityQuery.getBuild(project, value);
+ build = QueryUtils.getBuild(project, value);
return build;
}
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 227d4a431f..8288500273 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
@@ -8,9 +8,9 @@ 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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class FixedInCommitCriteria extends Criteria<Issue> {
@@ -36,7 +36,7 @@ public class FixedInCommitCriteria extends Criteria<Issue> {
private ProjectScopedCommit getCommit() {
if (commit == null)
- commit = EntityQuery.getCommitId(project, value);
+ commit = QueryUtils.getCommitId(project, value);
return commit;
}
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 01de00dcc2..da9c8d34b6 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
@@ -11,8 +11,8 @@ import javax.persistence.criteria.Predicate;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class FixedInPullRequestCriteria extends Criteria<Issue> {
@@ -38,7 +38,7 @@ public class FixedInPullRequestCriteria extends Criteria<Issue> {
public PullRequest getRequest() {
if (request == null)
- request = EntityQuery.getPullRequest(project, value);
+ request = QueryUtils.getPullRequest(project, value);
return request;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java
index a67674d392..c1b7ffa4fb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java
@@ -3,13 +3,14 @@ package io.onedev.server.search.entity.issue;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.IgnoredByMe;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
@@ -25,7 +26,7 @@ public class IgnoredByMeCriteria extends Criteria<Issue> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -34,7 +35,7 @@ public class IgnoredByMeCriteria extends Criteria<Issue> {
if (user != null)
return getCriteria(user).matches(issue);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
private Criteria<Issue> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index bfc820df02..695278c2ed 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -49,6 +49,13 @@ import static io.onedev.server.search.entity.issue.IssueQueryParser.MentionedMe;
import static io.onedev.server.search.entity.issue.IssueQueryParser.ReferencedInCurrentBranch;
import static io.onedev.server.search.entity.issue.IssueQueryParser.SubmittedByMe;
import static io.onedev.server.search.entity.issue.IssueQueryParser.WatchedByMe;
+import static io.onedev.server.util.QueryUtils.getBooleanValue;
+import static io.onedev.server.util.QueryUtils.getFloatValue;
+import static io.onedev.server.util.QueryUtils.getGroup;
+import static io.onedev.server.util.QueryUtils.getIntValue;
+import static io.onedev.server.util.QueryUtils.getNumber;
+import static io.onedev.server.util.QueryUtils.getUser;
+import static io.onedev.server.util.QueryUtils.getValue;
import java.util.ArrayList;
import java.util.Collection;
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 f603272276..7c5acab39c 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
@@ -11,9 +11,9 @@ import javax.persistence.criteria.Predicate;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class LastActivityDateCriteria extends Criteria<Issue> {
@@ -27,7 +27,7 @@ public class LastActivityDateCriteria extends Criteria<Issue> {
private final Date date;
public LastActivityDateCriteria(String value, int operator) {
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
this.operator = operator;
this.value = value;
}
@@ -48,7 +48,7 @@ public class LastActivityDateCriteria extends Criteria<Issue> {
@Override
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);
+ Path<Date> attribute = QueryUtils.getPath(from, Issue.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE);
if (operator == IssueQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java
index 3d4580dc60..5d3c749d35 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
@@ -2,7 +2,6 @@ package io.onedev.server.search.entity.issue;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.Nullable;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
@@ -10,7 +9,9 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
-import io.onedev.commons.utils.ExplicitException;
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueMention;
import io.onedev.server.model.User;
@@ -32,7 +33,7 @@ public class MentionedMeCriteria extends Criteria<Issue> {
builder.equal(mention.get(IssueMention.PROP_USER), User.get())));
return builder.exists(mentionQuery);
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
}
@@ -41,7 +42,7 @@ public class MentionedMeCriteria extends Criteria<Issue> {
if (User.get() != null)
return issue.getMentions().stream().anyMatch(it->it.getUser().equals(User.get()));
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
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 2207103ada..5fdb125cd1 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
@@ -10,8 +10,8 @@ import javax.persistence.criteria.Path;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class SubmitDateCriteria extends Criteria<Issue> {
@@ -25,7 +25,7 @@ public class SubmitDateCriteria extends Criteria<Issue> {
private final Date date;
public SubmitDateCriteria(String value, int operator) {
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
this.operator = operator;
this.value = value;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
index 8e8e4fb402..096df03ebe 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.issue;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
@@ -25,7 +26,7 @@ public class SubmittedByMeCriteria extends SubmittedByCriteria {
Path<User> attribute = from.get(Issue.PROP_SUBMITTER);
return builder.equal(attribute, User.get());
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
}
@@ -39,7 +40,7 @@ public class SubmittedByMeCriteria extends SubmittedByCriteria {
if (User.get() != null)
return User.get().equals(issue.getSubmitter());
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
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 fa4569f6ec..5704dabf5f 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
@@ -3,13 +3,14 @@ package io.onedev.server.search.entity.issue;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.WatchedByMe;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
@@ -25,7 +26,7 @@ public class WatchedByMeCriteria extends Criteria<Issue> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -34,7 +35,7 @@ public class WatchedByMeCriteria extends Criteria<Issue> {
if (user != null)
return getCriteria(user).matches(issue);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
private Criteria<Issue> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java
index 1201fd6543..b431063f35 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java
@@ -15,6 +15,9 @@ import static io.onedev.server.search.entity.pack.PackQueryParser.IsNot;
import static io.onedev.server.search.entity.pack.PackQueryParser.IsSince;
import static io.onedev.server.search.entity.pack.PackQueryParser.IsUntil;
import static io.onedev.server.search.entity.pack.PackQueryParser.PublishedByMe;
+import static io.onedev.server.util.QueryUtils.getLabelSpec;
+import static io.onedev.server.util.QueryUtils.getUser;
+import static io.onedev.server.util.QueryUtils.getValue;
import java.util.ArrayList;
import java.util.List;
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 35105fd00f..9c1ce21208 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
@@ -10,8 +10,8 @@ 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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class PublishDateCriteria extends Criteria<Pack> {
@@ -25,7 +25,7 @@ public class PublishDateCriteria extends Criteria<Pack> {
private final Date date;
public PublishDateCriteria(String value, int operator) {
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
this.operator = operator;
this.value = value;
}
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 0917b083b2..2db6b19845 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
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.pack;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Pack;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
@@ -25,7 +26,7 @@ public class PublishedByMeCriteria extends PublishedByCriteria {
Path<User> attribute = from.get(Pack.PROP_USER);
return builder.equal(attribute, User.get());
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
}
@@ -39,7 +40,7 @@ public class PublishedByMeCriteria extends PublishedByCriteria {
if (User.get() != null)
return User.get().equals(pack.getUser());
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java
index 21570a34fc..895394082b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java
@@ -10,8 +10,8 @@ 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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class PublishedViaBuildCriteria extends Criteria<Pack> {
@@ -28,7 +28,7 @@ public class PublishedViaBuildCriteria extends Criteria<Pack> {
}
public PublishedViaBuildCriteria(@Nullable Project project, String value) {
- build = EntityQuery.getBuild(project, value);
+ build = QueryUtils.getBuild(project, value);
this.value = value;
}
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 1137b70225..1513cb5772 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
@@ -11,8 +11,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.ProjectLastActivityDate;
-import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class LastActivityDateCriteria extends Criteria<Project> {
@@ -26,7 +26,7 @@ public class LastActivityDateCriteria extends Criteria<Project> {
private final Date date;
public LastActivityDateCriteria(String value, int operator) {
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
this.operator = operator;
this.value = value;
}
@@ -41,7 +41,7 @@ public class LastActivityDateCriteria extends Criteria<Project> {
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
- Path<Date> attribute = ProjectQuery.getPath(from, Project.PROP_LAST_ACTIVITY_DATE + "." + ProjectLastActivityDate.PROP_VALUE);
+ Path<Date> attribute = QueryUtils.getPath(from, Project.PROP_LAST_ACTIVITY_DATE + "." + ProjectLastActivityDate.PROP_VALUE);
if (operator == ProjectQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
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 b2c4e2158d..b2ea58cfa6 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.project;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
@@ -23,7 +24,7 @@ public class OwnedByMeCriteria extends OwnedByCriteria {
if (User.get() != null)
return new OwnedByUserCriteria(User.get()).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -36,7 +37,7 @@ public class OwnedByMeCriteria extends OwnedByCriteria {
if (User.get() != null)
return new OwnedByUserCriteria(User.get()).matches(project);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
index df720d86cb..5840f0c929 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
@@ -20,6 +20,11 @@ import static io.onedev.server.search.entity.project.ProjectQueryParser.OwnedByM
import static io.onedev.server.search.entity.project.ProjectQueryParser.OwnedByNone;
import static io.onedev.server.search.entity.project.ProjectQueryParser.Roots;
import static io.onedev.server.search.entity.project.ProjectQueryParser.WithoutEnoughReplicas;
+import static io.onedev.server.util.QueryUtils.getLabelSpec;
+import static io.onedev.server.util.QueryUtils.getLongValue;
+import static io.onedev.server.util.QueryUtils.getNumber;
+import static io.onedev.server.util.QueryUtils.getUser;
+import static io.onedev.server.util.QueryUtils.getValue;
import java.util.ArrayList;
import java.util.List;
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 f00df0d42d..e840b37b0e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
@@ -30,7 +31,7 @@ public class ApprovedByMeCriteria extends ApprovedByCriteria {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -39,7 +40,7 @@ public class ApprovedByMeCriteria extends ApprovedByCriteria {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
index 36108ff65b..f5027a6ac5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
@@ -25,7 +26,7 @@ public class AssignedToMeCriteria extends AssignedToCriteria {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -39,7 +40,7 @@ public class AssignedToMeCriteria extends AssignedToCriteria {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
index e135778eec..54789dc134 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
@@ -10,8 +10,8 @@ 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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class CloseDateCriteria extends Criteria<PullRequest> {
@@ -27,7 +27,7 @@ public class CloseDateCriteria extends Criteria<PullRequest> {
public CloseDateCriteria(String value, int operator) {
this.operator = operator;
this.value = value;
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
}
@Override
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 cfa9b4d837..b1de912fe8 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
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
@@ -24,7 +25,7 @@ public class CommentedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -33,7 +34,7 @@ public class CommentedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
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 835c6622fc..81d07074b2 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
@@ -10,6 +10,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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class HasMergeConflictsCriteria extends Criteria<PullRequest> {
@@ -18,8 +19,8 @@ public class HasMergeConflictsCriteria extends Criteria<PullRequest> {
@Override
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);
+ Path<?> requestHead = QueryUtils.getPath(from, PullRequest.PROP_MERGE_PREVIEW + "." + MergePreview.PROP_HEAD_COMMIT_HASH);
+ Path<?> merged = QueryUtils.getPath(from, PullRequest.PROP_MERGE_PREVIEW + "." + MergePreview.PROP_MERGED_COMMIT_HASH);
return builder.and(
builder.isNotNull(requestHead),
builder.isNull(merged));
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasUnfinishedBuildsCriteria.java
index c4f124b64b..5fd1ca7bfe 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
@@ -11,6 +11,7 @@ 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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class HasUnfinishedBuildsCriteria extends Criteria<PullRequest> {
@@ -23,7 +24,7 @@ public class HasUnfinishedBuildsCriteria extends Criteria<PullRequest> {
Root<Build> build = buildQuery.from(Build.class);
buildQuery.select(build);
var status = build.get(Build.PROP_STATUS);
- var buildCommitOfPullRequest = PullRequestQuery.getPath(from, PullRequest.PROP_BUILD_COMMIT_HASH);
+ var buildCommitOfPullRequest = QueryUtils.getPath(from, PullRequest.PROP_BUILD_COMMIT_HASH);
var buildCommit = build.get(Build.PROP_COMMIT_HASH);
buildQuery.where(builder.and(
builder.or(
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 f76a0fbae5..7e9e0a15c2 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
@@ -11,6 +11,7 @@ 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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class HasUnsuccessfulBuilds extends Criteria<PullRequest> {
@@ -23,7 +24,7 @@ public class HasUnsuccessfulBuilds extends Criteria<PullRequest> {
Root<Build> build = buildQuery.from(Build.class);
buildQuery.select(build);
var status = build.get(Build.PROP_STATUS);
- var buildCommitOfPullRequest = PullRequestQuery.getPath(from, PullRequest.PROP_BUILD_COMMIT_HASH);
+ var buildCommitOfPullRequest = QueryUtils.getPath(from, PullRequest.PROP_BUILD_COMMIT_HASH);
var buildCommit = build.get(Build.PROP_COMMIT_HASH);
buildQuery.where(builder.and(
builder.or(
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java
index 4b1770ddc3..fd47ae6cda 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java
@@ -1,20 +1,21 @@
package io.onedev.server.search.entity.pullrequest;
-import org.jspecify.annotations.Nullable;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IgnoredByMe;
+import static io.onedev.server.web.translation.Translation._T;
+
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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
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;
-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IgnoredByMe;
-import static io.onedev.server.web.translation.Translation._T;
-
public class IgnoredByMeCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -25,7 +26,7 @@ public class IgnoredByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -34,7 +35,7 @@ public class IgnoredByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
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 d348c12512..30725b7c1f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
@@ -13,9 +13,9 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.OneDev;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.xodus.PullRequestInfoService;
@@ -30,7 +30,7 @@ public class IncludesCommitCriteria extends Criteria<PullRequest> {
private final String value;
public IncludesCommitCriteria(@Nullable Project project, String value) {
- ProjectScopedCommit commitId = EntityQuery.getCommitId(project, value);
+ ProjectScopedCommit commitId = QueryUtils.getCommitId(project, value);
this.project = commitId.getProject();
this.commitId = commitId.getCommitId();
this.value = value;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
index 0a752d43da..68e71c71be 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
@@ -15,8 +15,8 @@ import io.onedev.server.OneDev;
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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.xodus.CommitInfoService;
import io.onedev.server.xodus.PullRequestInfoService;
@@ -30,7 +30,7 @@ public class IncludesIssueCriteria extends Criteria<PullRequest> {
private final String value;
public IncludesIssueCriteria(@Nullable Project project, String value) {
- issue = EntityQuery.getIssue(project, value);
+ issue = QueryUtils.getIssue(project, value);
this.value = value;
}
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 e9a181a52a..6f32306a4c 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
@@ -11,8 +11,8 @@ 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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class LastActivityDateCriteria extends Criteria<PullRequest> {
@@ -28,7 +28,7 @@ public class LastActivityDateCriteria extends Criteria<PullRequest> {
public LastActivityDateCriteria(String value, int operator) {
this.operator = operator;
this.value = value;
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
}
public int getOperator() {
@@ -41,7 +41,7 @@ public class LastActivityDateCriteria extends Criteria<PullRequest> {
@Override
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);
+ Path<Date> attribute = QueryUtils.getPath(from, PullRequest.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE);
if (operator == PullRequestQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java
index 002a8c3237..84dc6062d3 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
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
@@ -24,7 +25,7 @@ public class MentionedMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -33,7 +34,7 @@ public class MentionedMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
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 12c0ef4849..5c99799d42 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
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
@@ -24,7 +25,7 @@ public class NeedMyActionCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -33,7 +34,7 @@ public class NeedMyActionCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
index 69d909779b..a1fe8a3f7e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
@@ -45,6 +45,11 @@ import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.
import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ToBeReviewedByMe;
import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.WatchedBy;
import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.WatchedByMe;
+import static io.onedev.server.util.QueryUtils.getIntValue;
+import static io.onedev.server.util.QueryUtils.getLabelSpec;
+import static io.onedev.server.util.QueryUtils.getNumber;
+import static io.onedev.server.util.QueryUtils.getUser;
+import static io.onedev.server.util.QueryUtils.getValue;
import java.util.ArrayList;
import java.util.List;
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 9d3109b5d3..2182147320 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
@@ -24,7 +25,7 @@ public class RequestedForChangesByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -33,7 +34,7 @@ public class RequestedForChangesByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
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 2b7723615e..225b6225a3 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
@@ -10,8 +10,8 @@ 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.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class SubmitDateCriteria extends Criteria<PullRequest> {
@@ -27,7 +27,7 @@ public class SubmitDateCriteria extends Criteria<PullRequest> {
public SubmitDateCriteria(String value, int operator) {
this.operator = operator;
this.value = value;
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
}
@Override
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 c41e51098a..d8e2872ada 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
@@ -25,7 +26,7 @@ public class SubmittedByMeCriteria extends SubmittedByCriteria {
Path<?> attribute = from.get(PullRequest.PROP_SUBMITTER);
return builder.equal(attribute, User.get());
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
}
@@ -39,7 +40,7 @@ public class SubmittedByMeCriteria extends SubmittedByCriteria {
if (User.get() != null)
return User.get().equals(request.getSubmitter());
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@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 50df9dc457..b011530892 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
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
@@ -24,7 +25,7 @@ public class ToBeChangedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -33,7 +34,7 @@ public class ToBeChangedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
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 ff1cc530d6..7c9d3783b1 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
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
@@ -24,7 +25,7 @@ public class ToBeMergedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -33,7 +34,7 @@ public class ToBeMergedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
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 7c98dd7ddd..f32dd5b260 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
@@ -24,7 +25,7 @@ public class ToBeReviewedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -33,7 +34,7 @@ public class ToBeReviewedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
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 185df03faf..76027db9f8 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,20 +1,21 @@
package io.onedev.server.search.entity.pullrequest;
-import org.jspecify.annotations.Nullable;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.WatchedByMe;
+import static io.onedev.server.web.translation.Translation._T;
+
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 org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
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;
-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.WatchedByMe;
-import static io.onedev.server.web.translation.Translation._T;
-
public class WatchedByMeCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -25,7 +26,7 @@ public class WatchedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).getPredicate(projectScope, query, from, builder);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
@@ -34,7 +35,7 @@ public class WatchedByMeCriteria extends Criteria<PullRequest> {
if (user != null)
return getCriteria(user).matches(request);
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
private Criteria<PullRequest> getCriteria(User user) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/ActiveDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/ActiveDateCriteria.java
index c1b738c159..0629384a9a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/ActiveDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/ActiveDateCriteria.java
@@ -10,8 +10,8 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Workspace;
-import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class ActiveDateCriteria extends Criteria<Workspace> {
@@ -25,7 +25,7 @@ public class ActiveDateCriteria extends Criteria<Workspace> {
private final String value;
public ActiveDateCriteria(String value, int operator) {
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
this.operator = operator;
this.value = value;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreateDateCriteria.java
index b2aca8407d..76e0ee2763 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreateDateCriteria.java
@@ -10,8 +10,8 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Workspace;
-import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class CreateDateCriteria extends Criteria<Workspace> {
@@ -25,7 +25,7 @@ public class CreateDateCriteria extends Criteria<Workspace> {
private final String value;
public CreateDateCriteria(String value, int operator) {
- date = EntityQuery.getDateValue(value);
+ date = QueryUtils.getDateValue(value);
this.operator = operator;
this.value = value;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreatedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreatedByMeCriteria.java
index 5721a1ed86..9b78b842f9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreatedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/CreatedByMeCriteria.java
@@ -2,16 +2,17 @@ package io.onedev.server.search.entity.workspace;
import static io.onedev.server.web.translation.Translation._T;
-import org.jspecify.annotations.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.Workspace;
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.User;
+import io.onedev.server.model.Workspace;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScope;
@@ -25,7 +26,7 @@ public class CreatedByMeCriteria extends CreatedByCriteria {
Path<User> attribute = from.get(Workspace.PROP_USER);
return builder.equal(attribute, User.get());
} else {
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
}
@@ -39,7 +40,7 @@ public class CreatedByMeCriteria extends CreatedByCriteria {
if (User.get() != null)
return User.get().equals(workspace.getUser());
else
- throw new ExplicitException(_T("Please login to perform this query"));
+ throw new NotAcceptableException(_T("Please login to perform this query"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueCriteria.java
index 095cd4a91a..f2d190a40d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/IssueCriteria.java
@@ -11,8 +11,8 @@ import org.jspecify.annotations.Nullable;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.Workspace;
-import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class IssueCriteria extends Criteria<Workspace> {
@@ -26,7 +26,7 @@ public class IssueCriteria extends Criteria<Workspace> {
private final int operator;
public IssueCriteria(@Nullable Project project, String value, int operator) {
- issue = EntityQuery.getIssue(project, value);
+ issue = QueryUtils.getIssue(project, value);
this.value = value;
this.operator = operator;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestCriteria.java
index 2db3d255f1..ac9a3233a9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/PullRequestCriteria.java
@@ -11,8 +11,8 @@ import org.jspecify.annotations.Nullable;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.Workspace;
-import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
public class PullRequestCriteria extends Criteria<Workspace> {
@@ -26,7 +26,7 @@ public class PullRequestCriteria extends Criteria<Workspace> {
private final int operator;
public PullRequestCriteria(@Nullable Project project, String value, int operator) {
- pullRequest = EntityQuery.getPullRequest(project, value);
+ pullRequest = QueryUtils.getPullRequest(project, value);
this.value = value;
this.operator = operator;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.java
index 05569c029a..2580f2ea26 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.java
@@ -24,6 +24,10 @@ import static io.onedev.server.search.entity.workspace.WorkspaceQueryParser.IsNo
import static io.onedev.server.search.entity.workspace.WorkspaceQueryParser.IsSince;
import static io.onedev.server.search.entity.workspace.WorkspaceQueryParser.IsUntil;
import static io.onedev.server.search.entity.workspace.WorkspaceQueryParser.Pending;
+import static io.onedev.server.util.QueryUtils.getCommitId;
+import static io.onedev.server.util.QueryUtils.getNumber;
+import static io.onedev.server.util.QueryUtils.getUser;
+import static io.onedev.server.util.QueryUtils.getValue;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java
index 3de498d08a..2a04cd554d 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java
@@ -59,10 +59,10 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
-import io.onedev.server.search.entity.agent.AgentQuery;
import io.onedev.server.service.AgentAttributeService;
import io.onedev.server.service.AgentService;
import io.onedev.server.service.AgentTokenService;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.validation.validator.AttributeNameValidator;
@@ -302,13 +302,13 @@ public class DefaultAgentService extends BaseEntityService<Agent> implements Age
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
for (EntitySort sort: query.getSorts()) {
if (sort.getDirection() == ASCENDING)
- orders.add(builder.asc(AgentQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
+ orders.add(builder.asc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
else
- orders.add(builder.desc(AgentQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
+ orders.add(builder.desc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
}
if (orders.isEmpty())
- orders.add(builder.asc(AgentQuery.getPath(root, Agent.PROP_NAME)));
+ orders.add(builder.asc(QueryUtils.getPath(root, Agent.PROP_NAME)));
criteriaQuery.orderBy(orders);
return criteriaQuery;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
index 0de09c31b2..51ef9344f6 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java
@@ -114,6 +114,7 @@ import io.onedev.server.taskschedule.SchedulableTask;
import io.onedev.server.taskschedule.TaskScheduler;
import io.onedev.server.util.ProjectBuildStatusStat;
import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.util.StatusInfo;
import io.onedev.server.util.artifact.ArtifactInfo;
import io.onedev.server.util.artifact.DirectoryInfo;
@@ -647,9 +648,9 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Bui
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
for (EntitySort sort: query.getSorts()) {
if (sort.getDirection() == ASCENDING)
- orders.add(builder.asc(BuildQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
+ orders.add(builder.asc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
else
- orders.add(builder.desc(BuildQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
+ orders.add(builder.desc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
}
boolean found = false;
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentService.java
index ecc23fa6d1..9bb20937b2 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultCodeCommentService.java
@@ -62,10 +62,10 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.EntityCriteria;
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.service.CodeCommentService;
import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
@@ -244,7 +244,7 @@ public class DefaultCodeCommentService extends BaseEntityService<CodeComment> im
CriteriaQuery<?> query, From<CodeComment, CodeComment> root, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
if (request != null)
- predicates.add(builder.equal(CodeCommentQuery.getPath(root, CodeComment.PROP_COMPARE_CONTEXT + "." + CompareContext.PROP_PULL_REQUEST), request));
+ predicates.add(builder.equal(QueryUtils.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) {
@@ -266,9 +266,9 @@ public class DefaultCodeCommentService extends BaseEntityService<CodeComment> im
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
for (EntitySort sort: commentQuery.getSorts()) {
if (sort.getDirection() == ASCENDING)
- orders.add(builder.asc(CodeCommentQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
+ orders.add(builder.asc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
else
- orders.add(builder.desc(CodeCommentQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
+ orders.add(builder.desc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
}
if (commentQuery.getCriteria() != null)
@@ -287,7 +287,7 @@ public class DefaultCodeCommentService extends BaseEntityService<CodeComment> im
}
}
if (!found)
- orders.add(builder.desc(CodeCommentQuery.getPath(root, CodeComment.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE)));
+ orders.add(builder.desc(QueryUtils.getPath(root, CodeComment.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE)));
query.orderBy(orders);
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java
index de093a9ddd..8aa4fc0841 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java
@@ -121,6 +121,7 @@ import io.onedev.server.util.IssueTimes;
import io.onedev.server.util.IterationAndIssueState;
import io.onedev.server.util.ProjectIssueStateStat;
import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.QueryUtils;
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;
@@ -310,9 +311,9 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss
private javax.persistence.criteria.Order getOrder(EntitySort sort, CriteriaBuilder builder, From<Issue, Issue> issue) {
if (Issue.SORT_FIELDS.containsKey(sort.getField())) {
if (sort.getDirection() == Direction.ASCENDING)
- return builder.asc(IssueQuery.getPath(issue, Issue.SORT_FIELDS.get(sort.getField()).getProperty()));
+ return builder.asc(QueryUtils.getPath(issue, Issue.SORT_FIELDS.get(sort.getField()).getProperty()));
else
- return builder.desc(IssueQuery.getPath(issue, Issue.SORT_FIELDS.get(sort.getField()).getProperty()));
+ return builder.desc(QueryUtils.getPath(issue, Issue.SORT_FIELDS.get(sort.getField()).getProperty()));
} else {
Join<Issue, IssueField> join = issue.join(Issue.PROP_FIELDS, JoinType.LEFT);
join.on(builder.equal(join.get(IssueField.PROP_NAME), sort.getField()));
@@ -351,7 +352,7 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss
}
}
if (!found)
- orders.add(builder.desc(IssueQuery.getPath(issue, Issue.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE)));
+ orders.add(builder.desc(QueryUtils.getPath(issue, Issue.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE)));
return orders;
}
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java
index 0ff49145db..c6352a165b 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPackService.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
@@ -36,16 +35,11 @@ import org.apache.shiro.subject.Subject;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
+import org.jspecify.annotations.Nullable;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import io.onedev.server.service.PackBlobReferenceService;
-import io.onedev.server.service.PackBlobService;
-import io.onedev.server.service.PackLabelService;
-import io.onedev.server.service.PackService;
-import io.onedev.server.service.ProjectService;
-import io.onedev.server.service.UserService;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.pack.PackPublished;
import io.onedev.server.exception.HttpResponseAwareException;
@@ -58,10 +52,16 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
-import io.onedev.server.search.entity.pack.PackQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ReadPack;
+import io.onedev.server.service.PackBlobReferenceService;
+import io.onedev.server.service.PackBlobService;
+import io.onedev.server.service.PackLabelService;
+import io.onedev.server.service.PackService;
+import io.onedev.server.service.ProjectService;
+import io.onedev.server.service.UserService;
import io.onedev.server.util.ProjectPackTypeStat;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
@Singleton
@@ -104,9 +104,9 @@ public class DefaultPackService extends BaseEntityService<Pack>
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
for (EntitySort sort: sorts) {
if (sort.getDirection() == ASCENDING)
- orders.add(builder.asc(PackQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
+ orders.add(builder.asc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
else
- orders.add(builder.desc(PackQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
+ orders.add(builder.desc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));
}
if (orders.isEmpty())
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
index fb348dc43b..58b0f646c6 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java
@@ -147,7 +147,6 @@ import io.onedev.server.replica.ProjectReplica;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.issue.IssueQueryUpdater;
-import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.service.AuditService;
@@ -167,6 +166,7 @@ import io.onedev.server.service.UserService;
import io.onedev.server.taskschedule.SchedulableTask;
import io.onedev.server.taskschedule.TaskScheduler;
import io.onedev.server.util.ProjectNameReservation;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.util.SiteSyncUtils;
import io.onedev.server.util.artifact.ArtifactInfo;
import io.onedev.server.util.artifact.DirectoryInfo;
@@ -1008,9 +1008,9 @@ public class DefaultProjectService extends BaseEntityService<Project>
private Order getOrder(EntitySort sort, CriteriaBuilder builder, From<Project, Project> root) {
if (sort.getDirection() == ASCENDING)
- return builder.asc(ProjectQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty()));
+ return builder.asc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty()));
else
- return builder.desc(ProjectQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty()));
+ return builder.desc(QueryUtils.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty()));
}
@SuppressWarnings("rawtypes")
@@ -1046,7 +1046,7 @@ public class DefaultProjectService extends BaseEntityService<Project>
}
}
if (!found)
- orders.add(builder.desc(ProjectQuery.getPath(root, Project.PROP_LAST_ACTIVITY_DATE + "." + ProjectLastActivityDate.PROP_VALUE)));
+ orders.add(builder.desc(QueryUtils.getPath(root, Project.PROP_LAST_ACTIVITY_DATE + "." + ProjectLastActivityDate.PROP_VALUE)));
criteriaQuery.orderBy(orders);
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
index a9ddff7cb9..08d29ce0d9 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
@@ -130,7 +130,6 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
-import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.service.BuildService;
@@ -145,6 +144,7 @@ import io.onedev.server.service.UserService;
import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectPullRequestStatusStat;
import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.facade.EmailAddressFacade;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
@@ -1010,9 +1010,9 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
private Order getOrder(EntitySort sort, CriteriaBuilder builder, From<PullRequest, PullRequest> root) {
if (sort.getDirection() == Direction.ASCENDING)
- return builder.asc(PullRequestQuery.getPath(root, PullRequest.SORT_FIELDS.get(sort.getField()).getProperty()));
+ return builder.asc(QueryUtils.getPath(root, PullRequest.SORT_FIELDS.get(sort.getField()).getProperty()));
else
- return builder.desc(PullRequestQuery.getPath(root, PullRequest.SORT_FIELDS.get(sort.getField()).getProperty()));
+ return builder.desc(QueryUtils.getPath(root, PullRequest.SORT_FIELDS.get(sort.getField()).getProperty()));
}
@SuppressWarnings("rawtypes")
@@ -1047,7 +1047,7 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
}
}
if (!found)
- orders.add(builder.desc(PullRequestQuery.getPath(root, PullRequest.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE)));
+ orders.add(builder.desc(QueryUtils.getPath(root, PullRequest.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE)));
criteriaQuery.orderBy(orders);
diff --git a/server-core/src/main/java/io/onedev/server/util/QueryUtils.java b/server-core/src/main/java/io/onedev/server/util/QueryUtils.java
new file mode 100644
index 0000000000..970fb04167
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/QueryUtils.java
@@ -0,0 +1,209 @@
+package io.onedev.server.util;
+
+import java.util.Date;
+import java.util.regex.Pattern;
+
+import javax.persistence.criteria.Path;
+import javax.validation.ValidationException;
+
+import org.jspecify.annotations.Nullable;
+
+import com.google.common.base.Splitter;
+
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.entityreference.BuildReference;
+import io.onedev.server.entityreference.IssueReference;
+import io.onedev.server.entityreference.PullRequestReference;
+import io.onedev.server.exception.NotAcceptableException;
+import io.onedev.server.exception.NotFoundException;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Group;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Iteration;
+import io.onedev.server.model.LabelSpec;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.service.BuildService;
+import io.onedev.server.service.GroupService;
+import io.onedev.server.service.IssueService;
+import io.onedev.server.service.IterationService;
+import io.onedev.server.service.LabelSpecService;
+import io.onedev.server.service.ProjectService;
+import io.onedev.server.service.PullRequestService;
+import io.onedev.server.service.SettingService;
+import io.onedev.server.service.UserService;
+
+public class QueryUtils {
+
+ private static final Pattern INSIDE_QUOTE = Pattern.compile("\"([^\"\\\\]|\\\\.)*");
+
+ public static String getValue(String token) {
+ return StringUtils.unescape(FenceAware.unfence(token));
+ }
+
+ public static int getIntValue(String value) {
+ try {
+ return Integer.parseInt(value);
+ } catch (NumberFormatException e) {
+ throw new NotAcceptableException("Invalid number: " + value);
+ }
+ }
+
+ public static float getFloatValue(String value) {
+ try {
+ return Float.parseFloat(value);
+ } catch (NumberFormatException e) {
+ throw new NotAcceptableException("Invalid decimal: " + value);
+ }
+ }
+
+ public static LabelSpec getLabelSpec(String labelName) {
+ var labelSpec = OneDev.getInstance(LabelSpecService.class).find(labelName);
+ if (labelSpec != null)
+ return labelSpec;
+ else
+ throw new NotFoundException("Undefined label: " + labelName);
+ }
+
+ public static int getWorkingPeriodValue(String value) {
+ try {
+ var timeTrackingSetting = OneDev.getInstance(SettingService.class).getIssueSetting().getTimeTrackingSetting();
+ return timeTrackingSetting.parseWorkingPeriod(value);
+ } catch (ValidationException e) {
+ throw new NotAcceptableException("Invalid working period: " + value);
+ }
+ }
+
+ public static long getLongValue(String value) {
+ try {
+ return Long.parseLong(value);
+ } catch (NumberFormatException e) {
+ throw new NotAcceptableException("Invalid number: " + value);
+ }
+ }
+
+ public static User getUser(String loginName) {
+ User user = OneDev.getInstance(UserService.class).findByName(loginName);
+ if (user == null)
+ throw new NotFoundException("Unable to find user with login: " + loginName);
+ return user;
+ }
+
+ public static Group getGroup(String groupName) {
+ Group group = OneDev.getInstance(GroupService.class).find(groupName);
+ if (group == null)
+ throw new NotFoundException("Unable to find group: " + groupName);
+ return group;
+ }
+
+ public static Project getProject(String projectPath) {
+ Project project = OneDev.getInstance(ProjectService.class).findByPath(projectPath);
+ if (project == null)
+ throw new NotFoundException("Unable to find project '" + projectPath + "'");
+ return project;
+ }
+
+ public static boolean getBooleanValue(String value) {
+ if (value.equals("true"))
+ return true;
+ else if (value.equals("false"))
+ return false;
+ else
+ throw new NotAcceptableException("Invalid boolean: " + value);
+ }
+
+ public static Date getDateValue(String value) {
+ Date dateValue = DateUtils.parseRelaxed(value);
+ if (dateValue == null)
+ throw new NotAcceptableException("Unrecognized date: " + value);
+ return dateValue;
+ }
+
+ public static ProjectScopedCommit getCommitId(@Nullable Project project, String value) {
+ if (project != null && !value.contains(":"))
+ value = project.getPath() + ":" + value;
+ ProjectScopedCommit commitId = ProjectScopedCommit.from(value);
+ if (commitId != null && commitId.getCommitId() != null)
+ return commitId;
+ else
+ throw new NotFoundException("Unable to find revision: " + value);
+ }
+
+ public static ProjectScopedRevision getRevision(@Nullable Project project, String value) {
+ if (project != null && !value.contains(":"))
+ value = project.getPath() + ":" + value;
+ ProjectScopedRevision revision = ProjectScopedRevision.from(value);
+ if (revision != null)
+ return revision;
+ else
+ throw new NotFoundException("Unable to find revision: " + value);
+ }
+
+ public static Issue getIssue(@Nullable Project project, String value) {
+ var reference = IssueReference.of(value, project);
+ var issueService = OneDev.getInstance(IssueService.class);
+ var issue = issueService.find(reference.getProject(), reference.getNumber());
+ if (issue != null)
+ return issue.resolveMovedTo();
+ else
+ throw new NotFoundException("Unable to find issue: " + value);
+ }
+
+ public static PullRequest getPullRequest(@Nullable Project project, String value) {
+ var reference = PullRequestReference.of(value, project);
+ var pullRequest = OneDev.getInstance(PullRequestService.class).find(reference.getProject(), reference.getNumber());
+ if (pullRequest != null)
+ return pullRequest;
+ else
+ throw new NotFoundException("Unable to find pull request: " + value);
+ }
+
+ public static Build getBuild(@Nullable Project project, String value) {
+ var reference = BuildReference.of(value, project);
+ var build = OneDev.getInstance(BuildService.class).find(reference.getProject(), reference.getNumber());
+ if (build != null)
+ return build;
+ else
+ throw new NotFoundException("Unable to find build: " + value);
+ }
+
+ public static Long getNumber(String value) {
+ if (value.startsWith("#"))
+ value = value.substring(1);
+ try {
+ return Long.parseLong(value);
+ } catch (NumberFormatException e) {
+ throw new NotAcceptableException("Invalid number: " + value);
+ }
+ }
+
+ public static Iteration getIteration(@Nullable Project project, String value) {
+ if (project != null && !value.contains(":"))
+ value = project.getPath() + ":" + value;
+ Iteration iteration = OneDev.getInstance(IterationService.class).findInHierarchy(value);
+ if (iteration != null)
+ return iteration;
+ else
+ throw new NotFoundException("Unable to find iteration: " + value);
+ }
+
+ public static <T> Path<T> getPath(Path<?> root, String pathName) {
+ int index = pathName.indexOf('.');
+ if (index != -1) {
+ Path<T> path = root.get(pathName.substring(0, index));
+ for (String field: Splitter.on(".").split(pathName.substring(index+1)))
+ path = path.get(field);
+ return path;
+ } else {
+ return root.get(pathName);
+ }
+ }
+
+ public static boolean isInsideQuote(String value) {
+ return INSIDE_QUOTE.matcher(value.trim()).matches();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java
index f4ae408c8e..ee46918d0c 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java
@@ -38,7 +38,7 @@ import io.onedev.server.buildspec.job.action.condition.ActionConditionParser;
import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import io.onedev.server.search.entity.project.ProjectQuery;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
@@ -139,7 +139,7 @@ public class ActionConditionBehavior extends ANTLRAssistBehavior {
if ("criteriaValue".equals(spec.getLabel())) {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
- String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(NAME_PROJECT) || fieldName.equals(NAME_BRANCH) || fieldName.equals(NAME_TAG))
hints.add(_T("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>"));
else if (fieldName.equals(Build.NAME_LOG))
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java
index 9b057cc087..b32497f487 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java
@@ -29,6 +29,7 @@ import io.onedev.server.service.AgentAttributeService;
import io.onedev.server.service.AgentService;
import io.onedev.server.service.SettingService;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.behavior.inputassist.NaturalLanguageTranslator;
@@ -81,7 +82,7 @@ public class AgentQueryBehavior extends ANTLRAssistBehavior {
return SuggestionUtils.suggestBuilds(null, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
}
} else {
- String fieldName = AgentQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
try {
AgentQuery.checkField(fieldName, operator);
switch (fieldName) {
@@ -156,7 +157,7 @@ public class AgentQueryBehavior extends ANTLRAssistBehavior {
if (parseExpect != null) {
List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
if (!fieldElements.isEmpty()) {
- String fieldName = AgentQuery.getValue(fieldElements.iterator().next().getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.iterator().next().getMatchedText());
try {
AgentQuery.checkField(fieldName, AgentQuery.getOperator(suggestedLiteral));
} catch (ExplicitException e) {
@@ -172,10 +173,10 @@ public class AgentQueryBehavior extends ANTLRAssistBehavior {
List<String> hints = new ArrayList<>();
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");
- if (criteriaValueExpect != null && AgentQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {
+ if (criteriaValueExpect != null && QueryUtils.isInsideQuote(terminalExpect.getUnmatchedText())) {
List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
- String fieldName = AgentQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(Agent.NAME_NAME)
|| fieldName.equals(Agent.NAME_OS_NAME)
|| fieldName.equals(Agent.NAME_OS_ARCH)
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
index 05b31c95ed..41595749dc 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
@@ -27,9 +27,9 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.BuildMetric;
import io.onedev.server.search.buildmetric.BuildMetricQuery;
-import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.buildmetric.BuildMetricQueryParser;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
@@ -82,7 +82,7 @@ public class BuildMetricQueryBehavior extends ANTLRAssistBehavior {
List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);
return !suggestions.isEmpty()? suggestions: null;
} else {
- String fieldName = EntityQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
try {
BuildMetricQuery.checkField(project, fieldName, operator);
if (fieldName.equals(Build.NAME_JOB)) {
@@ -130,7 +130,7 @@ public class BuildMetricQueryBehavior extends ANTLRAssistBehavior {
if (parseExpect != null) {
List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
if (!fieldElements.isEmpty()) {
- String fieldName = EntityQuery.getValue(fieldElements.iterator().next().getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.iterator().next().getMatchedText());
try {
BuildMetricQuery.checkField(getProject(), fieldName, BuildMetricQuery.getOperator(suggestedLiteral));
} catch (ExplicitException e) {
@@ -146,10 +146,10 @@ public class BuildMetricQueryBehavior extends ANTLRAssistBehavior {
List<String> hints = new ArrayList<>();
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");
- if (criteriaValueExpect != null && EntityQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {
+ if (criteriaValueExpect != null && QueryUtils.isInsideQuote(terminalExpect.getUnmatchedText())) {
List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
- String fieldName = EntityQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(Build.NAME_PROJECT) || fieldName.equals(Build.NAME_VERSION)
|| fieldName.equals(Build.NAME_JOB)) {
hints.add(_T("Use '*' for wildcard match"));
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index bc353d3416..53d91f633c 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -32,6 +32,7 @@ import io.onedev.server.search.entity.build.BuildQueryParser;
import io.onedev.server.service.BuildParamService;
import io.onedev.server.service.SettingService;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.behavior.inputassist.NaturalLanguageTranslator;
@@ -113,7 +114,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
}
} else {
- String fieldName = BuildQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
try {
BuildQuery.checkField(project, fieldName, operator);
switch (fieldName) {
@@ -218,7 +219,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
if (parseExpect != null) {
List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
if (!fieldElements.isEmpty()) {
- String fieldName = BuildQuery.getValue(fieldElements.iterator().next().getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.iterator().next().getMatchedText());
try {
BuildQuery.checkField(getProject(), fieldName, BuildQuery.getOperator(suggestedLiteral));
} catch (ExplicitException e) {
@@ -237,7 +238,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
if (criteriaValueExpect != null) {
List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
- String fieldName = BuildQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(Build.NAME_PROJECT)) {
hints.add(_T("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>"));
} else if (fieldName.equals(Build.NAME_VERSION) || fieldName.equals(Build.NAME_JOB)) {
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
index b3fbe2da01..fe39a72f86 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
@@ -14,8 +14,8 @@ import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser;
-import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -81,7 +81,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
else
return null;
} else {
- String fieldName = CodeCommentQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
try {
CodeCommentQuery.checkField(project, fieldName, operator);
if (fieldName.equals(CodeComment.NAME_CREATE_DATE)
@@ -141,7 +141,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
if (parseExpect != null) {
List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
if (!fieldElements.isEmpty()) {
- String fieldName = CodeCommentQuery.getValue(fieldElements.iterator().next().getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.iterator().next().getMatchedText());
try {
CodeCommentQuery.checkField(getProject(), fieldName, CodeCommentQuery.getOperator(suggestedLiteral));
} catch (ExplicitException e) {
@@ -157,10 +157,10 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
List<String> hints = new ArrayList<>();
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");
- if (criteriaValueExpect != null && ProjectQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {
+ if (criteriaValueExpect != null && QueryUtils.isInsideQuote(terminalExpect.getUnmatchedText())) {
List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
- String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(CodeComment.NAME_CONTENT)) {
hints.add(_T("Use '*' for wildcard match"));
hints.add(_T("Use '\\' to escape quotes"));
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index edcc6bd104..8fa244b1a4 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -25,7 +25,6 @@ import static io.onedev.server.model.Issue.NAME_TITLE;
import static io.onedev.server.model.Issue.NAME_VOTE_COUNT;
import static io.onedev.server.model.Issue.QUERY_FIELDS;
import static io.onedev.server.model.Issue.SORT_FIELDS;
-import static io.onedev.server.search.entity.EntityQuery.getValue;
import static io.onedev.server.search.entity.issue.IssueQuery.checkField;
import static io.onedev.server.search.entity.issue.IssueQuery.getOperator;
import static io.onedev.server.search.entity.issue.IssueQuery.getRuleName;
@@ -48,6 +47,7 @@ import static io.onedev.server.search.entity.issue.IssueQueryLexer.WatchedBy;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.WatchedByMe;
import static io.onedev.server.search.entity.issue.IssueQueryParser.IgnoredBy;
import static io.onedev.server.search.entity.issue.IssueQueryParser.IgnoredByMe;
+import static io.onedev.server.util.QueryUtils.getValue;
import static io.onedev.server.web.translation.Translation._T;
import static java.util.stream.Collectors.toList;
@@ -97,7 +97,6 @@ import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
import io.onedev.server.search.entity.issue.IssueQueryParser;
-import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.service.GroupService;
import io.onedev.server.service.LinkSpecService;
import io.onedev.server.service.SettingService;
@@ -401,7 +400,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
if (criteriaValueExpect != null) {
List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
- String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = getValue(fieldElements.get(0).getMatchedText());
var fieldSpec = issueSetting.getFieldSpec(fieldName);
if (fieldName.equals(Issue.NAME_PROJECT)) {
hints.add(_T("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>"));
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java
index 992a961828..aa93a26b87 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java
@@ -37,6 +37,7 @@ import io.onedev.server.search.entity.pack.PackQueryLexer;
import io.onedev.server.search.entity.pack.PackQueryParser;
import io.onedev.server.service.SettingService;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.behavior.inputassist.NaturalLanguageTranslator;
@@ -113,7 +114,7 @@ public class PackQueryBehavior extends ANTLRAssistBehavior {
return null;
}
} else {
- String fieldName = PackQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
try {
PackQuery.checkField(project, fieldName, operator);
if (fieldName.equals(Pack.NAME_PUBLISH_DATE)) {
@@ -190,7 +191,7 @@ public class PackQueryBehavior extends ANTLRAssistBehavior {
if (parseExpect != null) {
List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
if (!fieldElements.isEmpty()) {
- String fieldName = PackQuery.getValue(fieldElements.iterator().next().getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.iterator().next().getMatchedText());
try {
PackQuery.checkField(getProject(), fieldName, PackQuery.getOperator(suggestedLiteral));
} catch (ExplicitException e) {
@@ -210,7 +211,7 @@ public class PackQueryBehavior extends ANTLRAssistBehavior {
List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);
List<Element> operatorElements = criteriaValueExpect.getState().findMatchedElementsByLabel("operator", true);
if (!fieldElements.isEmpty()) {
- String fieldName = PackQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(Pack.NAME_PROJECT)) {
hints.add(_T("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>"));
} else if (fieldName.equals(NAME_NAME) || fieldName.equals(NAME_VERSION)) {
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
index d6d7522de8..668179c4c4 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
@@ -37,6 +37,7 @@ import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.service.ProjectService;
import io.onedev.server.service.SettingService;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.behavior.inputassist.NaturalLanguageTranslator;
@@ -91,7 +92,7 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {
return SuggestionUtils.suggestUsers(matchWith);
}
} else {
- String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
try {
ProjectQuery.checkField(fieldName, operator);
if (fieldName.equals(Project.NAME_LAST_ACTIVITY_DATE)) {
@@ -187,7 +188,7 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {
if (parseExpect != null) {
List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
if (!fieldElements.isEmpty()) {
- String fieldName = ProjectQuery.getValue(fieldElements.iterator().next().getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.iterator().next().getMatchedText());
try {
ProjectQuery.checkField(fieldName, ProjectQuery.getOperator(suggestedLiteral));
} catch (ExplicitException e) {
@@ -207,7 +208,7 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {
if (criteriaValueExpect != null) {
List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
- String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(Project.NAME_NAME)
|| fieldName.equals(Project.NAME_KEY)
|| fieldName.equals(Project.NAME_SERVICE_DESK_EMAIL_ADDRESS)) {
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
index d76a02b08d..e662050ede 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
@@ -1,7 +1,6 @@
package io.onedev.server.web.behavior;
import static io.onedev.server.model.AbstractEntity.NAME_NUMBER;
-import static io.onedev.server.search.entity.EntityQuery.getValue;
import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.checkField;
import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.getOperator;
import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.getRuleName;
@@ -20,6 +19,7 @@ import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.T
import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.ToBeMergedByMe;
import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.ToBeReviewedByMe;
import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.WatchedByMe;
+import static io.onedev.server.util.QueryUtils.getValue;
import static io.onedev.server.web.translation.Translation._T;
import java.util.ArrayList;
@@ -46,10 +46,10 @@ import io.onedev.server.ai.QueryDescriptions;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
-import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser;
import io.onedev.server.service.SettingService;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.behavior.inputassist.NaturalLanguageTranslator;
@@ -236,10 +236,10 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
List<String> hints = new ArrayList<>();
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
ParseExpect criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue");
- if (criteriaValueExpect != null && ProjectQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {
+ if (criteriaValueExpect != null && QueryUtils.isInsideQuote(terminalExpect.getUnmatchedText())) {
List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
- String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(PullRequest.NAME_TARGET_PROJECT)
|| fieldName.equals(PullRequest.NAME_TARGET_BRANCH)) {
hints.add(_T("Use '**', '*', or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>"));
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/WorkspaceQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/WorkspaceQueryBehavior.java
index 4e232fad6b..1b4142234e 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/WorkspaceQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/WorkspaceQueryBehavior.java
@@ -30,6 +30,7 @@ import io.onedev.server.search.entity.workspace.WorkspaceQueryLexer;
import io.onedev.server.search.entity.workspace.WorkspaceQueryParser;
import io.onedev.server.service.SettingService;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.behavior.inputassist.NaturalLanguageTranslator;
@@ -99,7 +100,7 @@ public class WorkspaceQueryBehavior extends ANTLRAssistBehavior {
} else if (!fieldElements.isEmpty() && operatorElements.size() == 1) {
String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());
int operator = WorkspaceQuery.getOperator(operatorName);
- String fieldName = WorkspaceQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
try {
WorkspaceQuery.checkField(fieldName, operator);
switch (fieldName) {
@@ -190,7 +191,7 @@ public class WorkspaceQueryBehavior extends ANTLRAssistBehavior {
if (parseExpect != null) {
List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
if (!fieldElements.isEmpty()) {
- String fieldName = WorkspaceQuery.getValue(fieldElements.iterator().next().getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.iterator().next().getMatchedText());
try {
WorkspaceQuery.checkField(fieldName, WorkspaceQuery.getOperator(suggestedLiteral));
} catch (ExplicitException e) {
@@ -209,7 +210,7 @@ public class WorkspaceQueryBehavior extends ANTLRAssistBehavior {
if (criteriaValueExpect != null) {
List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
- String fieldName = WorkspaceQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = QueryUtils.getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(Workspace.NAME_PROJECT)) {
hints.add(_T("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>"));
} else if (fieldName.equals(Workspace.NAME_BRANCH)) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index 5840d9165a..0e21d634f9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -54,6 +54,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.exception.ExceptionUtils;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.RevListOptions;
import io.onedev.server.git.service.GitService;
@@ -86,8 +87,8 @@ import io.onedev.server.web.component.savedquery.SavedQueriesLink;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
import io.onedev.server.web.component.workspace.speclist.WorkspaceSpecListPanel;
-import io.onedev.server.web.page.project.compare.RevisionComparePage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
+import io.onedev.server.web.page.project.compare.RevisionComparePage;
import io.onedev.server.web.util.QuerySaveSupport;
public abstract class CommitListPanel extends Panel {
@@ -156,12 +157,14 @@ public abstract class CommitListPanel extends Panel {
commitHashes = gitService.revList(getProject(), options);
} catch (Exception e) {
- if (e.getMessage() != null)
- error(e.getMessage());
- else
+ var explicitException = ExceptionUtils.find(e, ExplicitException.class);
+ if (explicitException != null) {
+ error(explicitException.getMessage());
+ } else {
error(_T("Error calculating commits: check log for details"));
+ logger.error("Error calculating commits", e);
+ }
commitHashes = new ArrayList<>();
- logger.error("Error calculating commits: ", e);
}
} else {
commitHashes = new ArrayList<>();
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 855bc8b832..7bed1f4c92 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
@@ -424,9 +424,6 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new BasePageMapper("~projects", ProjectListPage.class));
add(new BasePageMapper("~projects/new", NewProjectPage.class));
add(new BasePageMapper("~projects/import/${importer}", ProjectImportPage.class));
-
- // For backward compatibility
- add(new BasePageMapper("projects/${project}", ProjectOverviewPage.class));
add(new ProjectPageMapper("${project}", ProjectOverviewPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index 34b3fc41c1..a299508bf2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -6,6 +6,7 @@ import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import java.io.File;
import java.io.Serializable;
+import java.time.DateTimeException;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Collection;
@@ -53,6 +54,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.jspecify.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.unbescape.javascript.JavaScriptEscape;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -93,6 +96,8 @@ import io.onedev.server.web.websocket.WebSocketService;
public abstract class BasePage extends WebPage {
+ private static final Logger logger = LoggerFactory.getLogger(BasePage.class);
+
private static final MetaDataKey<HashSet<String>> REMOVE_AUTOSAVE_KEYS = new MetaDataKey<>() {
};
@@ -355,7 +360,14 @@ public abstract class BasePage extends WebPage {
@Override
protected void respond(AjaxRequestTarget target) {
- var zoneId = ZoneId.of(RequestCycle.get().getRequest().getRequestParameters().getParameterValue("timezone").toString());
+ var timeZoneId = RequestCycle.get().getRequest().getRequestParameters().getParameterValue("timezone").toString();
+ ZoneId zoneId;
+ try {
+ zoneId = ZoneId.of(timeZoneId);
+ } catch (DateTimeException e) {
+ logger.debug("Unable to parse time-zone ID: {}, using system default", timeZoneId, e);
+ zoneId = ZoneId.systemDefault();
+ }
WebSession.get().setZoneId(zoneId);
if (!zoneId.equals(ZoneId.systemDefault())) {
visitChildren(Component.class, (IVisitor<Component, Void>) (object, visit) -> {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
index 7dfb98a906..a0fa8ac4c2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
@@ -1,16 +1,27 @@
package io.onedev.server.web.page.help;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.WordUtils;
-import io.onedev.server.OneDev;
-import io.onedev.server.service.SettingService;
-import io.onedev.server.rest.ParamCheckFilter;
-import io.onedev.server.rest.annotation.Api;
-import io.onedev.server.rest.resource.TriggerJobResource;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
-import io.onedev.server.web.util.TextUtils;
+import static io.onedev.server.web.page.help.ValueInfo.Origin.CREATE_BODY;
+import static io.onedev.server.web.page.help.ValueInfo.Origin.UPDATE_BODY;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.io.InputStream;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
+
import org.apache.wicket.Component;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -23,28 +34,19 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import org.jspecify.annotations.Nullable;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import static io.onedev.server.web.page.help.ValueInfo.Origin.CREATE_BODY;
-import static io.onedev.server.web.page.help.ValueInfo.Origin.UPDATE_BODY;
-import static io.onedev.server.web.translation.Translation._T;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.WordUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.exception.NotFoundException;
+import io.onedev.server.rest.ParamCheckFilter;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.rest.resource.TriggerJobResource;
+import io.onedev.server.service.SettingService;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
+import io.onedev.server.web.util.TextUtils;
public class MethodDetailPage extends ApiHelpPage {
@@ -66,7 +68,7 @@ public class MethodDetailPage extends ApiHelpPage {
}
String errorMessage = String.format("Unable to find resource method (resource: %s, method: %s)",
resourceClass.getName(), methodName);
- throw new ExplicitException(errorMessage);
+ throw new NotFoundException(errorMessage);
}
};
@@ -74,10 +76,11 @@ public class MethodDetailPage extends ApiHelpPage {
public MethodDetailPage(PageParameters params) {
super(params);
+ var className = params.get(PARAM_RESOURCE).toString();
try {
- resourceClass = Class.forName(params.get(PARAM_RESOURCE).toString());
+ resourceClass = Class.forName(className);
} catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
+ throw new NotFoundException("Resource class not found: " + className);
}
methodName = params.get(PARAM_METHOD).toString();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ResourceDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/ResourceDetailPage.java
index 02eeba80ef..ef08fd2572 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ResourceDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ResourceDetailPage.java
@@ -20,6 +20,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.server.exception.NotFoundException;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
public class ResourceDetailPage extends ApiHelpPage {
@@ -30,10 +31,11 @@ public class ResourceDetailPage extends ApiHelpPage {
public ResourceDetailPage(PageParameters params) {
super(params);
+ var className = params.get(PARAM_RESOURCE).toString();
try {
- resourceClass = Class.forName(params.get(PARAM_RESOURCE).toString());
+ resourceClass = Class.forName(className);
} catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
+ throw new NotFoundException("Resource class not found: " + className);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index f4ec002d3f..c5d5edfb45 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -11,7 +11,6 @@ import java.util.Map;
import javax.inject.Inject;
import javax.persistence.EntityNotFoundException;
-import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
@@ -32,9 +31,6 @@ import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.Request;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
@@ -131,22 +127,6 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware, Ch
public ProjectPage(PageParameters params) {
super(params);
-
- Request request = RequestCycle.get().getRequest();
- String requestUrl = request.getUrl().toString();
- requestUrl = StringUtils.stripStart(requestUrl, "/");
- if (requestUrl.startsWith("projects/")) {
- requestUrl = StringUtils.stripStart(requestUrl.substring("projects/".length()), "/");
- Long projectId = Long.valueOf(StringUtils.substringBefore(requestUrl, "/"));
- Project project = getProjectService().load(projectId);
- String suffix = StringUtils.substringAfter(requestUrl, "/");
-
- String redirectUrl = "/" + project.getPath();
- if (StringUtils.isNotBlank(suffix))
- redirectUrl += "/~" + suffix;
-
- throw new RedirectToUrlException(redirectUrl, HttpServletResponse.SC_MOVED_PERMANENTLY);
- }
String projectPath = params.get(ProjectMapperUtils.PARAM_PROJECT).toOptionalString();
if (projectPath == null)
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
index 133660fbd8..8a89624a31 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
@@ -4,8 +4,6 @@ import static io.onedev.server.web.translation.Translation._T;
import java.util.List;
-import org.jspecify.annotations.Nullable;
-
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -15,19 +13,20 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.jspecify.annotations.Nullable;
-import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
-import io.onedev.server.service.IssueService;
-import io.onedev.server.service.SettingService;
+import io.onedev.server.exception.NotAcceptableException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
+import io.onedev.server.service.IssueService;
+import io.onedev.server.service.SettingService;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.component.issue.create.NewIssueEditor;
import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;
@@ -48,7 +47,7 @@ public class NewIssuePage extends ProjectPage implements InputContext {
super(params);
if (!getProject().isIssueManagement())
- throw new ExplicitException(_T("Issue management not enabled in this project"));
+ throw new NotAcceptableException(_T("Issue management not enabled in this project"));
User currentUser = getLoginUser();
if (currentUser == null)
diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
index a3e715b3b9..2af9605654 100644
--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
@@ -111,6 +111,7 @@ import io.onedev.server.taskschedule.SchedulableTask;
import io.onedev.server.taskschedule.TaskScheduler;
import io.onedev.server.terminal.Terminal;
import io.onedev.server.util.ProjectWorkspaceStatusStat;
+import io.onedev.server.util.QueryUtils;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.interpolative.WorkspaceVariableInterpolator;
import io.onedev.server.web.component.terminal.ShellExit;
@@ -472,9 +473,9 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
for (EntitySort sort : sessionQuery.getSorts()) {
var sortField = Workspace.SORT_FIELDS.get(sort.getField());
if (sort.getDirection() == ASCENDING)
- orders.add(builder.asc(EntityQuery.getPath(root, sortField.getProperty())));
+ orders.add(builder.asc(QueryUtils.getPath(root, sortField.getProperty())));
else
- orders.add(builder.desc(EntityQuery.getPath(root, sortField.getProperty())));
+ orders.add(builder.desc(QueryUtils.getPath(root, sortField.getProperty())));
}
if (!orders.isEmpty())
criteriaQuery.orderBy(orders);