The Unified and Autonomous Development Platform
chore: Refactoring
Robin Shen7b3acc87a99f
diff --git a/server-core/src/main/java/io/onedev/server/annotation/EnvironmentName.java b/server-core/src/main/java/io/onedev/server/annotation/EnvName.javasimilarity index 77%rename from server-core/src/main/java/io/onedev/server/annotation/EnvironmentName.javarename to server-core/src/main/java/io/onedev/server/annotation/EnvName.javaindex 7573044bc7..1f9e560d3a 100644--- a/server-core/src/main/java/io/onedev/server/annotation/EnvironmentName.java+++ b/server-core/src/main/java/io/onedev/server/annotation/EnvName.java@@ -8,12 +8,12 @@ import java.lang.annotation.Target;import javax.validation.Constraint;import javax.validation.Payload;-import io.onedev.server.validation.validator.EnvironmentNameValidator;+import io.onedev.server.validation.validator.EnvNameValidator;@Target({ElementType.METHOD, ElementType.FIELD})@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=EnvironmentNameValidator.class)-public @interface EnvironmentName {+@Constraint(validatedBy=EnvNameValidator.class)+public @interface EnvName {String message() default "name should start with letter and can only consist of "+ "alphanumeric and underscore characters";diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.javaindex 1ca07922c4..8952ebb131 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java@@ -7,7 +7,7 @@ import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.buildspec.BuildSpec;-import io.onedev.server.annotation.EnvironmentName;+import io.onedev.server.annotation.EnvName;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;@@ -22,7 +22,7 @@ public class EnvVar implements Serializable {@Editable(order=100, description="Specify name of the environment variable")@Interpolative(variableSuggester="suggestVariables")- @EnvironmentName+ @EnvName@NotEmptypublic String getName() {return name;diff --git a/server-core/src/main/java/io/onedev/server/service/AgentService.java b/server-core/src/main/java/io/onedev/server/service/AgentService.javaindex f3dce65bc9..7fe9c0eed7 100644--- a/server-core/src/main/java/io/onedev/server/service/AgentService.java+++ b/server-core/src/main/java/io/onedev/server/service/AgentService.java@@ -38,9 +38,9 @@ public interface AgentService extends EntityService<Agent> {Collection<String> getOsArchs();- List<Agent> query(EntityQuery<Agent> agentQuery, int firstResult, int maxResults);+ List<Agent> query(EntityQuery<Agent> query, int firstResult, int maxResults);- int count(@Nullable Criteria<Agent> agentCriteria);+ int count(@Nullable Criteria<Agent> criteria);void restart(Agent agent);diff --git a/server-core/src/main/java/io/onedev/server/service/BuildService.java b/server-core/src/main/java/io/onedev/server/service/BuildService.javaindex e9c9cd11c3..31a7739c59 100644--- a/server-core/src/main/java/io/onedev/server/service/BuildService.java+++ b/server-core/src/main/java/io/onedev/server/service/BuildService.java@@ -67,10 +67,10 @@ public interface BuildService extends EntityService<Build> {List<Build> query(Subject subject, Project project, String fuzzyQuery, int count);- List<Build> query(Subject subject, @Nullable Project project, EntityQuery<Build> buildQuery,+ List<Build> query(Subject subject, @Nullable Project project, EntityQuery<Build> query,boolean loadLabels, int firstResult, int maxResults);- int count(Subject subject, @Nullable Project project, Criteria<Build> buildCriteria);+ int count(Subject subject, @Nullable Project project, @Nullable Criteria<Build> criteria);Collection<Long> getNumbers(Long projectId);diff --git a/server-core/src/main/java/io/onedev/server/service/IssueService.java b/server-core/src/main/java/io/onedev/server/service/IssueService.javaindex 2a897d0d40..3f9b35ac0a 100644--- a/server-core/src/main/java/io/onedev/server/service/IssueService.java+++ b/server-core/src/main/java/io/onedev/server/service/IssueService.java@@ -48,19 +48,19 @@ public interface IssueService extends EntityService<Issue> {List<Issue> queryPinned(Subject subject, Project project);- Predicate[] buildPredicates(Subject subject, @Nullable ProjectScope projectScope, @Nullable Criteria<Issue> issueCriteria,- CriteriaQuery<?> query, CriteriaBuilder builder, From<Issue, Issue> issue);+ Predicate[] buildPredicates(Subject subject, @Nullable ProjectScope projectScope,+ @Nullable Criteria<Issue> criteria, CriteriaQuery<?> query, CriteriaBuilder builder,+ From<Issue, Issue> issue);List<javax.persistence.criteria.Order> buildOrders(EntityQuery<Issue> query, CriteriaBuilder builder,- From<Issue, Issue> issue,- List<javax.persistence.criteria.Order> preferOrders);+ From<Issue, Issue> issue, List<javax.persistence.criteria.Order> preferOrders);- List<Issue> query(Subject subject, @Nullable ProjectScope projectScope, EntityQuery<Issue> issueQuery,+ List<Issue> query(Subject subject, @Nullable ProjectScope projectScope, EntityQuery<Issue> query,boolean loadExtraInfo, int firstResult, int maxResults);- int count(Subject subject, @Nullable ProjectScope projectScope, @Nullable Criteria<Issue> issueCriteria);+ int count(Subject subject, @Nullable ProjectScope projectScope, @Nullable Criteria<Issue> criteria);- IssueTimes queryTimes(Subject subject, ProjectScope projectScope, @Nullable Criteria<Issue> issueCriteria);+ IssueTimes queryTimes(Subject subject, ProjectScope projectScope, @Nullable Criteria<Issue> criteria);Collection<String> getUndefinedStates();diff --git a/server-core/src/main/java/io/onedev/server/service/PackService.java b/server-core/src/main/java/io/onedev/server/service/PackService.javaindex e08b1f0f65..f0deb0213f 100644--- a/server-core/src/main/java/io/onedev/server/service/PackService.java+++ b/server-core/src/main/java/io/onedev/server/service/PackService.java@@ -21,7 +21,7 @@ public interface PackService extends EntityService<Pack> {List<Pack> query(Subject subject, @Nullable Project project, EntityQuery<Pack> packQuery,boolean loadLabelsAndBlobs, int firstResult, int maxResults);- int count(Subject subject, @Nullable Project project, Criteria<Pack> packCriteria);+ int count(Subject subject, @Nullable Project project, @Nullable Criteria<Pack> criteria);List<Pack> queryPrevComparables(Pack compareWith, String fuzzyQuery, int count);diff --git a/server-core/src/main/java/io/onedev/server/service/ProjectService.java b/server-core/src/main/java/io/onedev/server/service/ProjectService.javaindex d01447d863..d2ca2efebb 100644--- a/server-core/src/main/java/io/onedev/server/service/ProjectService.java+++ b/server-core/src/main/java/io/onedev/server/service/ProjectService.java@@ -82,7 +82,7 @@ public interface ProjectService extends EntityService<Project> {List<Project> query(Subject subject, EntityQuery<Project> query, boolean loadLabels, int firstResult, int maxResults);- int count(Subject subject, Criteria<Project> criteria);+ int count(Subject subject, @Nullable Criteria<Project> criteria);Predicate getPathMatchPredicate(CriteriaBuilder builder, Path<Project> path, String pathPattern);diff --git a/server-core/src/main/java/io/onedev/server/service/PullRequestService.java b/server-core/src/main/java/io/onedev/server/service/PullRequestService.javaindex 2ab6329c25..576bf00131 100644--- a/server-core/src/main/java/io/onedev/server/service/PullRequestService.java+++ b/server-core/src/main/java/io/onedev/server/service/PullRequestService.java@@ -61,22 +61,22 @@ public interface PullRequestService extends EntityService<PullRequest> {void checkAutoMerge(PullRequest request);List<PullRequest> query(Subject subject, @Nullable Project targetProject,- EntityQuery<PullRequest> requestQuery, boolean loadExtraInfo,+ EntityQuery<PullRequest> query, boolean loadExtraInfo,int firstResult, int maxResults);- int count(Subject subject, @Nullable Project targetProject,- @Nullable Criteria<PullRequest> requestCriteria);+ int count(Subject subject, @Nullable Project targetProject, @Nullable Criteria<PullRequest> criteria);void delete(Collection<PullRequest> requests, Project project);List<ProjectPullRequestStatusStat> queryStatusStats(Collection<Project> projects);- Map<Integer, Integer> queryDurationStats(Subject subject, Project project, @Nullable Criteria<PullRequest> pullRequestCriteria,- @Nullable Date startDate, @Nullable Date endDate, StatsGroup statsGroup);+ Map<Integer, Integer> queryDurationStats(Subject subject, Project project,+ @Nullable Criteria<PullRequest> criteria, @Nullable Date startDate, @Nullable Date endDate,+ StatsGroup statsGroup);Map<Integer, Pair<Integer, Integer>> queryFrequencyStats(Subject subject, Project project,- @Nullable Criteria<PullRequest> pullRequestCriteria,- @Nullable Date startDate, @Nullable Date endDate, StatsGroup statsGroup);+ @Nullable Criteria<PullRequest> criteria, @Nullable Date startDate, @Nullable Date endDate,+ StatsGroup statsGroup);/*** When compare oldCommitId and newCommitId in context of pull request, assume below scenario: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.javaindex 52645e6e99..789034c0f4 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@@ -240,9 +240,13 @@ public class DefaultAgentService extends BaseEntityService<Agent> implements Age}private void removeReferences(Agent agent) {- Query<?> query = getSession().createQuery("update Build set agent=null where agent=:agent");- query.setParameter("agent", agent);- query.executeUpdate();+ Query<?> query = getSession().createQuery("update Build set agent=null where agent=:agent");+ query.setParameter("agent", agent);+ query.executeUpdate();++ query = getSession().createQuery("update DevSession set agent=null where agent=:agent");+ query.setParameter("agent", agent);+ query.executeUpdate();}@Sessional@@ -290,17 +294,17 @@ public class DefaultAgentService extends BaseEntityService<Agent> implements Agereturn osArchs.keySet();}- private CriteriaQuery<Agent> buildCriteriaQuery(org.hibernate.Session session, EntityQuery<Agent> agentQuery) {+ private CriteriaQuery<Agent> buildCriteriaQuery(org.hibernate.Session session, EntityQuery<Agent> query) {CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<Agent> query = builder.createQuery(Agent.class);- Root<Agent> root = query.from(Agent.class);- query.select(root);+ CriteriaQuery<Agent> criteriaQuery = builder.createQuery(Agent.class);+ Root<Agent> root = criteriaQuery.from(Agent.class);+ criteriaQuery.select(root);- if (agentQuery.getCriteria() != null)- query.where(agentQuery.getCriteria().getPredicate(null, query, root, builder));+ if (query.getCriteria() != null)+ criteriaQuery.where(query.getCriteria().getPredicate(null, criteriaQuery, root, builder));List<javax.persistence.criteria.Order> orders = new ArrayList<>();- for (EntitySort sort: agentQuery.getSorts()) {+ for (EntitySort sort: query.getSorts()) {if (sort.getDirection() == ASCENDING)orders.add(builder.asc(AgentQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));else@@ -309,31 +313,31 @@ public class DefaultAgentService extends BaseEntityService<Agent> implements Ageif (orders.isEmpty())orders.add(builder.asc(AgentQuery.getPath(root, Agent.PROP_NAME)));- query.orderBy(orders);+ criteriaQuery.orderBy(orders);- return query;+ return criteriaQuery;}@Sessional@Override- public List<Agent> query(EntityQuery<Agent> agentQuery, int firstResult, int maxResults) {- CriteriaQuery<Agent> criteriaQuery = buildCriteriaQuery(getSession(), agentQuery);- Query<Agent> query = getSession().createQuery(criteriaQuery);- query.setFirstResult(firstResult);- query.setMaxResults(maxResults);- query.setCacheable(true);- return query.getResultList();+ public List<Agent> query(EntityQuery<Agent> query, int firstResult, int maxResults) {+ CriteriaQuery<Agent> criteriaQuery = buildCriteriaQuery(getSession(), query);+ Query<Agent> hibernateQuery = getSession().createQuery(criteriaQuery);+ hibernateQuery.setFirstResult(firstResult);+ hibernateQuery.setMaxResults(maxResults);+ hibernateQuery.setCacheable(true);+ return hibernateQuery.getResultList();}@Sessional@Override- public int count(Criteria<Agent> agentCriteria) {+ public int count(Criteria<Agent> criteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Agent> root = criteriaQuery.from(Agent.class);- if (agentCriteria != null)- criteriaQuery.where(agentCriteria.getPredicate(null, criteriaQuery, root, builder));+ if (criteria != null)+ criteriaQuery.where(criteria.getPredicate(null, criteriaQuery, root, builder));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.javaindex a9d65d3d0d..afa8262929 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@@ -649,28 +649,28 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Bui}private CriteriaQuery<Build> buildCriteriaQuery(Subject subject, @Nullable Project project,- Session session, EntityQuery<Build> buildQuery) {+ Session session, EntityQuery<Build> query) {CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<Build> query = builder.createQuery(Build.class);- Root<Build> root = query.from(Build.class);- query.select(root);+ CriteriaQuery<Build> criteriaQuery = builder.createQuery(Build.class);+ Root<Build> root = criteriaQuery.from(Build.class);+ criteriaQuery.select(root);- query.where(getPredicates(subject, project, buildQuery.getCriteria(), query, root, builder));+ criteriaQuery.where(getPredicates(subject, project, query.getCriteria(), criteriaQuery, root, builder));- applyOrders(root, query, builder, buildQuery);+ applyOrders(root, criteriaQuery, builder, query);- return query;+ return criteriaQuery;}@Sessional@Override- public List<Build> query(Subject subject, Project project, EntityQuery<Build> buildQuery,+ public List<Build> query(Subject subject, Project project, EntityQuery<Build> query,boolean loadLabels, int firstResult, int maxResults) {- CriteriaQuery<Build> criteriaQuery = buildCriteriaQuery(subject, project, getSession(), buildQuery);- Query<Build> query = getSession().createQuery(criteriaQuery);- query.setFirstResult(firstResult);- query.setMaxResults(maxResults);- var builds = query.getResultList();+ CriteriaQuery<Build> criteriaQuery = buildCriteriaQuery(subject, project, getSession(), query);+ Query<Build> hibernateQuery = getSession().createQuery(criteriaQuery);+ hibernateQuery.setFirstResult(firstResult);+ hibernateQuery.setMaxResults(maxResults);+ var builds = hibernateQuery.getResultList();if (!builds.isEmpty() && loadLabels)labelService.populateLabels(builds);return builds;@@ -678,9 +678,9 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Bui@SuppressWarnings("rawtypes")private void applyOrders(From<Build, Build> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder builder,- EntityQuery<Build> buildQuery) {+ EntityQuery<Build> query) {List<javax.persistence.criteria.Order> orders = new ArrayList<>();- for (EntitySort sort: buildQuery.getSorts()) {+ for (EntitySort sort: query.getSorts()) {if (sort.getDirection() == ASCENDING)orders.add(builder.asc(BuildQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));else@@ -702,33 +702,32 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Bui}@Sessional- protected Collection<Long> queryIds(Project project, EntityQuery<Build> buildQuery,- int firstResult, int maxResults) {+ protected Collection<Long> queryIds(Project project, EntityQuery<Build> query, int firstResult, int maxResults) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Build> root = criteriaQuery.from(Build.class);criteriaQuery.select(root.get(Build.PROP_ID));var subject = userService.getSystem().asSubject();- criteriaQuery.where(getPredicates(subject, project, buildQuery.getCriteria(), criteriaQuery, root, builder));+ criteriaQuery.where(getPredicates(subject, project, query.getCriteria(), criteriaQuery, root, builder));- applyOrders(root, criteriaQuery, builder, buildQuery);+ applyOrders(root, criteriaQuery, builder, query);- Query<Long> query = getSession().createQuery(criteriaQuery);- query.setFirstResult(firstResult);- query.setMaxResults(maxResults);+ Query<Long> hibernateQuery = getSession().createQuery(criteriaQuery);+ hibernateQuery.setFirstResult(firstResult);+ hibernateQuery.setMaxResults(maxResults);- return query.list();+ return hibernateQuery.list();}@Sessional@Override- public int count(Subject subject, Project project, Criteria<Build> buildCriteria) {+ public int count(Subject subject, Project project, Criteria<Build> criteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Build> root = criteriaQuery.from(Build.class);- criteriaQuery.where(getPredicates(subject, project, buildCriteria, criteriaQuery, root, builder));+ criteriaQuery.where(getPredicates(subject, project, criteria, criteriaQuery, root, builder));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.javaindex 46c81a4eb2..a6bb630f08 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@@ -324,23 +324,23 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss@Sessional@Override- public List<Issue> query(Subject subject, ProjectScope projectScope, EntityQuery<Issue> issueQuery,+ public List<Issue> query(Subject subject, ProjectScope projectScope, EntityQuery<Issue> query,boolean loadExtraInfo, int firstResult, int maxResults) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Issue> criteriaQuery = builder.createQuery(Issue.class);Root<Issue> root = criteriaQuery.from(Issue.class);- criteriaQuery.where(buildPredicates(subject, projectScope, issueQuery.getCriteria(), criteriaQuery, builder, root));- var criteria = issueQuery.getCriteria();+ criteriaQuery.where(buildPredicates(subject, projectScope, query.getCriteria(), criteriaQuery, builder, root));+ var criteria = query.getCriteria();List<javax.persistence.criteria.Order> preferOrders = new ArrayList<>();if (criteria != null)preferOrders.addAll(criteria.getPreferOrders(builder, root));- criteriaQuery.orderBy(buildOrders(issueQuery, builder, root, preferOrders));+ criteriaQuery.orderBy(buildOrders(query, builder, root, preferOrders));- Query<Issue> query = getSession().createQuery(criteriaQuery);- query.setFirstResult(firstResult);- query.setMaxResults(maxResults);- List<Issue> issues = query.getResultList();+ Query<Issue> hibernateQuery = getSession().createQuery(criteriaQuery);+ hibernateQuery.setFirstResult(firstResult);+ hibernateQuery.setMaxResults(maxResults);+ List<Issue> issues = hibernateQuery.getResultList();if (loadExtraInfo && !issues.isEmpty()) {fieldService.populateFields(issues);linkService.populateLinks(issues);@@ -358,12 +358,12 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss@Sessional@Override- public int count(Subject subject, ProjectScope projectScope, Criteria<Issue> issueCriteria) {+ public int count(Subject subject, ProjectScope projectScope, Criteria<Issue> criteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Issue> root = criteriaQuery.from(Issue.class);- criteriaQuery.where(buildPredicates(subject, projectScope, issueCriteria, criteriaQuery, builder, root));+ criteriaQuery.where(buildPredicates(subject, projectScope, criteria, criteriaQuery, builder, root));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();@@ -371,12 +371,12 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss@Sessional@Override- public IssueTimes queryTimes(Subject subject, ProjectScope projectScope, Criteria<Issue> issueCriteria) {+ public IssueTimes queryTimes(Subject subject, ProjectScope projectScope, Criteria<Issue> criteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<IssueTimes> criteriaQuery = builder.createQuery(IssueTimes.class);Root<Issue> root = criteriaQuery.from(Issue.class);- criteriaQuery.where(buildPredicates(subject, projectScope, issueCriteria, criteriaQuery, builder, root));+ criteriaQuery.where(buildPredicates(subject, projectScope, criteria, criteriaQuery, builder, root));criteriaQuery.multiselect(builder.sum(root.get(PROP_OWN_ESTIMATED_TIME)),@@ -385,7 +385,7 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Iss}@Override- public Predicate[] buildPredicates(Subject subject, ProjectScope projectScope, Criteria<Issue> issueCriteria,+ public Predicate[] buildPredicates(Subject subject, ProjectScope projectScope, Criteria<Issue> criteria,CriteriaQuery<?> query, CriteriaBuilder builder, From<Issue, Issue> issue) {List<Predicate> predicates = new ArrayList<>();if (projectScope != null) {@@ -424,8 +424,8 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Isspredicates.add(builder.disjunction());}}- if (issueCriteria != null)- predicates.add(issueCriteria.getPredicate(projectScope, query, issue, builder));+ if (criteria != null)+ predicates.add(criteria.getPredicate(projectScope, query, issue, builder));return predicates.toArray(new Predicate[predicates.size()]);}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.javaindex a654e68ee1..21588c321c 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@@ -84,18 +84,17 @@ public class DefaultPackService extends BaseEntityService<Pack>@Injectprivate ListenerRegistry listenerRegistry;- private CriteriaQuery<Pack> buildCriteriaQuery(Subject subject, Project project,- Session session, EntityQuery<Pack> packQuery) {+ private CriteriaQuery<Pack> buildCriteriaQuery(Subject subject, Project project, Session session, EntityQuery<Pack> query) {CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<Pack> query = builder.createQuery(Pack.class);- Root<Pack> root = query.from(Pack.class);- query.select(root);+ CriteriaQuery<Pack> criteriaQuery = builder.createQuery(Pack.class);+ Root<Pack> root = criteriaQuery.from(Pack.class);+ criteriaQuery.select(root);- query.where(getPredicates(subject, project, packQuery.getCriteria(), query, root, builder));+ criteriaQuery.where(getPredicates(subject, project, query.getCriteria(), criteriaQuery, root, builder));- applyOrders(root, query, builder, packQuery.getSorts());+ applyOrders(root, criteriaQuery, builder, query.getSorts());- return query;+ return criteriaQuery;}private void applyOrders(From<Pack, Pack> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder builder,@@ -115,13 +114,13 @@ public class DefaultPackService extends BaseEntityService<Pack>@Sessional@Override- public List<Pack> query(Subject subject, Project project, EntityQuery<Pack> packQuery,+ public List<Pack> query(Subject subject, Project project, EntityQuery<Pack> query,boolean loadLabelsAndBlobs, int firstResult, int maxResults) {- CriteriaQuery<Pack> criteriaQuery = buildCriteriaQuery(subject, project, getSession(), packQuery);- Query<Pack> query = getSession().createQuery(criteriaQuery);- query.setFirstResult(firstResult);- query.setMaxResults(maxResults);- var packs = query.getResultList();+ CriteriaQuery<Pack> criteriaQuery = buildCriteriaQuery(subject, project, getSession(), query);+ Query<Pack> hibernateQuery = getSession().createQuery(criteriaQuery);+ hibernateQuery.setFirstResult(firstResult);+ hibernateQuery.setMaxResults(maxResults);+ var packs = hibernateQuery.getResultList();if (!packs.isEmpty() && loadLabelsAndBlobs) {labelService.populateLabels(packs);@@ -164,12 +163,12 @@ public class DefaultPackService extends BaseEntityService<Pack>@Sessional@Override- public int count(Subject subject, Project project, Criteria<Pack> packCriteria) {+ public int count(Subject subject, Project project, Criteria<Pack> criteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Pack> root = criteriaQuery.from(Pack.class);- criteriaQuery.where(getPredicates(subject, project, packCriteria, criteriaQuery, root, builder));+ criteriaQuery.where(getPredicates(subject, project, criteria, criteriaQuery, root, builder));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultProjectService.javaindex 19b60d8612..c12fe670e5 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@@ -1015,23 +1015,23 @@ public class DefaultProjectService extends BaseEntityService<Project>}@SuppressWarnings("rawtypes")- private CriteriaQuery<Project> buildCriteriaQuery(Subject subject, Session session, EntityQuery<Project> projectQuery) {+ private CriteriaQuery<Project> buildCriteriaQuery(Subject subject, Session session, EntityQuery<Project> query) {CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<Project> query = builder.createQuery(Project.class);- Root<Project> root = query.from(Project.class);- query.select(root);+ CriteriaQuery<Project> criteriaQuery = builder.createQuery(Project.class);+ Root<Project> root = criteriaQuery.from(Project.class);+ criteriaQuery.select(root);- query.where(getPredicates(subject, projectQuery.getCriteria(), query, root, builder));+ criteriaQuery.where(getPredicates(subject, query.getCriteria(), criteriaQuery, root, builder));List<Order> orders = new ArrayList<>();- for (EntitySort sort : projectQuery.getSorts())+ for (EntitySort sort : query.getSorts())orders.add(getOrder(sort, builder, root));- if (projectQuery.getCriteria() != null)- orders.addAll(projectQuery.getCriteria().getPreferOrders(builder, root));+ if (query.getCriteria() != null)+ orders.addAll(query.getCriteria().getPreferOrders(builder, root));- for (EntitySort sort : projectQuery.getBaseSorts())+ for (EntitySort sort : query.getBaseSorts())orders.add(getOrder(sort, builder, root));var found = false;@@ -1049,9 +1049,9 @@ public class DefaultProjectService extends BaseEntityService<Project>if (!found)orders.add(builder.desc(ProjectQuery.getPath(root, Project.PROP_LAST_ACTIVITY_DATE + "." + ProjectLastActivityDate.PROP_VALUE)));- query.orderBy(orders);+ criteriaQuery.orderBy(orders);- return query;+ return criteriaQuery;}private Predicate[] getPredicates(Subject subject, @Nullable Criteria<Project> criteria, CriteriaQuery<?> query,@@ -1075,10 +1075,10 @@ public class DefaultProjectService extends BaseEntityService<Project>@Overridepublic List<Project> query(Subject subject, EntityQuery<Project> query, boolean loadLabels, int firstResult, int maxResults) {CriteriaQuery<Project> criteriaQuery = buildCriteriaQuery(subject, getSession(), query);- Query<Project> projectQuery = getSession().createQuery(criteriaQuery);- projectQuery.setFirstResult(firstResult);- projectQuery.setMaxResults(maxResults);- var projects = projectQuery.getResultList();+ Query<Project> hibernateQuery = getSession().createQuery(criteriaQuery);+ hibernateQuery.setFirstResult(firstResult);+ hibernateQuery.setMaxResults(maxResults);+ var projects = hibernateQuery.getResultList();if (!projects.isEmpty() && loadLabels)labelService.populateLabels(projects);@@ -1088,12 +1088,12 @@ public class DefaultProjectService extends BaseEntityService<Project>@Sessional@Override- public int count(Subject subject, Criteria<Project> projectCriteria) {+ public int count(Subject subject, Criteria<Project> criteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Project> root = criteriaQuery.from(Project.class);- criteriaQuery.where(getPredicates(subject, projectCriteria, criteriaQuery, root, builder));+ criteriaQuery.where(getPredicates(subject, criteria, criteriaQuery, root, builder));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.javaindex 97a3d997f8..24697f177c 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@@ -866,7 +866,7 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>}}- private Predicate[] getPredicates(Subject subject, Project targetProject, Criteria<PullRequest> criteria,+ private Predicate[] getPredicates(Subject subject, Project targetProject, @Nullable Criteria<PullRequest> criteria,CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();if (targetProject != null) {@@ -899,21 +899,21 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>@SuppressWarnings("rawtypes")private CriteriaQuery<PullRequest> buildCriteriaQuery(Subject subject, Session session,- @Nullable Project targetProject, EntityQuery<PullRequest> requestQuery) {+ @Nullable Project targetProject, EntityQuery<PullRequest> query) {CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class);- Root<PullRequest> root = query.from(PullRequest.class);+ CriteriaQuery<PullRequest> criteriaQuery = builder.createQuery(PullRequest.class);+ Root<PullRequest> root = criteriaQuery.from(PullRequest.class);- query.where(getPredicates(subject, targetProject, requestQuery.getCriteria(), query, root, builder));+ criteriaQuery.where(getPredicates(subject, targetProject, query.getCriteria(), criteriaQuery, root, builder));List<Order> orders = new ArrayList<>();- for (EntitySort sort: requestQuery.getSorts())+ for (EntitySort sort: query.getSorts())orders.add(getOrder(sort, builder, root));- if (requestQuery.getCriteria() != null)- orders.addAll(requestQuery.getCriteria().getPreferOrders(builder, root));+ if (query.getCriteria() != null)+ orders.addAll(query.getCriteria().getPreferOrders(builder, root));- for (EntitySort sort: requestQuery.getBaseSorts())+ for (EntitySort sort: query.getBaseSorts())orders.add(getOrder(sort, builder, root));var found = false;@@ -931,22 +931,22 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>if (!found)orders.add(builder.desc(PullRequestQuery.getPath(root, PullRequest.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE)));- query.orderBy(orders);+ criteriaQuery.orderBy(orders);- return query;+ return criteriaQuery;}@Sessional@Overridepublic List<PullRequest> query(Subject subject, Project targetProject,- EntityQuery<PullRequest> requestQuery, boolean loadExtraInfo,+ EntityQuery<PullRequest> query, boolean loadExtraInfo,int firstResult, int maxResults) {- CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(subject, getSession(), targetProject, requestQuery);- Query<PullRequest> query = getSession().createQuery(criteriaQuery);- query.setFirstResult(firstResult);- query.setMaxResults(maxResults);+ CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(subject, getSession(), targetProject, query);+ Query<PullRequest> hibernateQuery = getSession().createQuery(criteriaQuery);+ hibernateQuery.setFirstResult(firstResult);+ hibernateQuery.setMaxResults(maxResults);- List<PullRequest> requests = query.getResultList();+ List<PullRequest> requests = hibernateQuery.getResultList();if (!requests.isEmpty() && loadExtraInfo) {reviewService.populateReviews(requests);buildService.populateBuilds(requests);@@ -958,12 +958,12 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>@Sessional@Override- public int count(Subject subject, Project targetProject, Criteria<PullRequest> requestCriteria) {+ public int count(Subject subject, Project targetProject, Criteria<PullRequest> criteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<PullRequest> root = criteriaQuery.from(PullRequest.class);- criteriaQuery.where(getPredicates(subject, targetProject, requestCriteria, criteriaQuery, root, builder));+ criteriaQuery.where(getPredicates(subject, targetProject, criteria, criteriaQuery, root, builder));criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();@@ -1026,13 +1026,13 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>@Sessional@Overridepublic Map<Integer, Integer> queryDurationStats(Subject subject, Project project,- Criteria<PullRequest> pullRequestCriteria, Date startDate, Date endDate,+ Criteria<PullRequest> criteria, Date startDate, Date endDate,StatsGroup statsGroup) {CriteriaBuilder builder = dao.getSession().getCriteriaBuilder();CriteriaQuery<Object[]> criteriaQuery = builder.createQuery(Object[].class);Root<PullRequest> root = criteriaQuery.from(PullRequest.class);- var predicates = new ArrayList<Predicate>(asList(getPredicates(subject, project, pullRequestCriteria, criteriaQuery, root, builder)));+ var predicates = new ArrayList<Predicate>(asList(getPredicates(subject, project, criteria, criteriaQuery, root, builder)));predicates.add(builder.equal(root.get(PROP_STATUS), MERGED));predicates.add(builder.isNotNull(root.get(PROP_DURATION)));if (startDate != null)@@ -1058,13 +1058,13 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>@Sessional@Overridepublic Map<Integer, Pair<Integer, Integer>> queryFrequencyStats(Subject subject,- Project project, Criteria<PullRequest> pullRequestCriteria, Date startDate,+ Project project, Criteria<PullRequest> criteria, Date startDate,Date endDate, StatsGroup statsGroup) {CriteriaBuilder builder = dao.getSession().getCriteriaBuilder();CriteriaQuery<Object[]> criteriaQuery = builder.createQuery(Object[].class);Root<PullRequest> root = criteriaQuery.from(PullRequest.class);- var pullRequestPredicates = asList(getPredicates(subject, project, pullRequestCriteria, criteriaQuery, root, builder));+ var pullRequestPredicates = asList(getPredicates(subject, project, criteria, criteriaQuery, root, builder));var predicates = new ArrayList<>(pullRequestPredicates);predicates.add(builder.equal(root.get(PROP_STATUS), OPEN));diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/EnvironmentNameValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/EnvNameValidator.javasimilarity index 76%rename from server-core/src/main/java/io/onedev/server/validation/validator/EnvironmentNameValidator.javarename to server-core/src/main/java/io/onedev/server/validation/validator/EnvNameValidator.javaindex 1cab9f777d..12827f74b3 100644--- a/server-core/src/main/java/io/onedev/server/validation/validator/EnvironmentNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/validation/validator/EnvNameValidator.java@@ -4,14 +4,14 @@ import javax.lang.model.SourceVersion;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;-import io.onedev.server.annotation.EnvironmentName;+import io.onedev.server.annotation.EnvName;-public class EnvironmentNameValidator implements ConstraintValidator<EnvironmentName, String> {+public class EnvNameValidator implements ConstraintValidator<EnvName, String> {private String message;@Override- public void initialize(EnvironmentName constaintAnnotation) {+ public void initialize(EnvName constaintAnnotation) {message = constaintAnnotation.message();}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.htmlindex f0179e57c4..8d36d15625 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.html@@ -13,10 +13,6 @@<label class="control-label"><wicket:t>Submitted By</wicket:t></label><input wicket:id="submittedBy" type="hidden" class="form-control"></div>- <div class="form-group">- <label class="control-label"><wicket:t>Label</wicket:t></label>- <input wicket:id="label" type="hidden" class="form-control">- </div><div class="form-group"><label class="control-label"><wicket:t>Ran On Agent</wicket:t></label><input wicket:id="ranAgent" type="hidden" class="form-control">@@ -33,4 +29,8 @@<input wicket:id="submittedBefore" type="text" class="form-control"></div></div>+ <div class="form-group">+ <label class="control-label"><wicket:t>Label</wicket:t></label>+ <input wicket:id="label" type="hidden" class="form-control">+ </div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex bf34a94727..f0eaedd7c0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -1041,25 +1041,25 @@ public abstract class BuildListPanel extends Panel {@Overridepublic Iterator<? extends Build> iterator(long first, long count) {try {- var subject = SecurityUtils.getSubject();- return getBuildService().query(subject, getProject(), queryModel.getObject(),- true, (int) first, (int) count).iterator();+ var query = queryModel.getObject();+ if (query != null) {+ return getBuildService().query(SecurityUtils.getSubject(), getProject(), query,+ true, (int) first, (int) count).iterator();+ }} catch (ExplicitException e) {error(e.getMessage());- return new ArrayList<Build>().iterator();}+ return new ArrayList<Build>().iterator();}@Overridepublic long calcSize() {- BuildQuery query = queryModel.getObject();- if (query != null) {- try {- var subject = SecurityUtils.getSubject();- return getBuildService().count(subject, getProject(), query.getCriteria());- } catch (ExplicitException e) {- error(e.getMessage());- }+ try {+ BuildQuery query = queryModel.getObject();+ if (query != null)+ return getBuildService().count(SecurityUtils.getSubject(), getProject(), query.getCriteria());+ } catch (ExplicitException e) {+ error(e.getMessage());}return 0;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.htmlindex 291dcbc889..be5f33de9b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.html@@ -3,10 +3,6 @@<label class="control-label"><wicket:t>Type</wicket:t></label><input wicket:id="type" type="hidden" class="form-control"></div>- <div class="form-group">- <label class="control-label"><wicket:t>Label</wicket:t></label>- <input wicket:id="label" type="hidden" class="form-control">- </div><div class="form-group"><label class="control-label"><wicket:t>Published After</wicket:t></label><div class="clearable-wrapper">@@ -27,4 +23,8 @@<label class="control-label"><wicket:t>Published By User</wicket:t></label><input wicket:id="publishedByUser" type="hidden" class="form-control"></div>+ <div class="form-group">+ <label class="control-label"><wicket:t>Label</wicket:t></label>+ <input wicket:id="label" type="hidden" class="form-control">+ </div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.javaindex c42299664b..8dfd5c69f5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java@@ -562,23 +562,25 @@ public abstract class PackListPanel extends Panel {@Overridepublic Iterator<? extends Pack> iterator(long first, long count) {try {- return getPackService().query(SecurityUtils.getSubject(), getProject(), queryModel.getObject(),- true, (int) first, (int) count).iterator();+ var query = queryModel.getObject();+ if (query != null) {+ return getPackService().query(SecurityUtils.getSubject(), getProject(), query,+ true, (int) first, (int) count).iterator();+ }} catch (ExplicitException e) {error(e.getMessage());- return new ArrayList<Pack>().iterator();}+ return new ArrayList<Pack>().iterator();}@Overridepublic long calcSize() {- PackQuery query = queryModel.getObject();- if (query != null) {- try {+ try {+ PackQuery query = queryModel.getObject();+ if (query != null)return getPackService().count(SecurityUtils.getSubject(), getProject(), query.getCriteria());- } catch (ExplicitException e) {- error(e.getMessage());- }+ } catch (ExplicitException e) {+ error(e.getMessage());}return 0;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.htmlindex 7da8edb33f..b8692bd2e1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.html@@ -27,10 +27,6 @@<label class="control-label"><wicket:t>Ownered By</wicket:t></label><input wicket:id="ownedBy" type="hidden" class="form-control"></div>- <div class="form-group">- <label class="control-label"><wicket:t>Label</wicket:t></label>- <input wicket:id="label" type="hidden" class="form-control">- </div><div class="form-group"><label class="control-label"><wicket:t>Active Since</wicket:t></label><div class="clearable-wrapper">@@ -43,4 +39,8 @@<input wicket:id="notActiveSince" type="text" class="form-control"></div></div>+ <div class="form-group">+ <label class="control-label"><wicket:t>Label</wicket:t></label>+ <input wicket:id="label" type="hidden" class="form-control">+ </div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.htmlindex d4ca5182d2..35095b36c3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.html@@ -11,10 +11,6 @@<label class="control-label">Assigned To</label><input wicket:id="assignedTo" type="hidden" class="form-control"></div>- <div class="form-group">- <label class="control-label">Label</label>- <input wicket:id="label" type="hidden" class="form-control">- </div><div class="form-group"><label class="control-label">Active Since</label><div class="clearable-wrapper">@@ -27,4 +23,8 @@<input wicket:id="notActiveSince" type="text" class="form-control"></div></div>+ <div class="form-group">+ <label class="control-label">Label</label>+ <input wicket:id="label" type="hidden" class="form-control">+ </div></wicket:extend>\ No newline at end of file