The Unified and Autonomous Development Platform
chore: Refactoring various sort defaults
Robin Shencce316c4c94f
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex b247ca5c9a..988ab93dc6 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -61,6 +61,7 @@ import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;+import org.hibernate.query.criteria.internal.path.SingularAttributePath;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;import org.slf4j.Logger;@@ -628,6 +629,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buireturn builds;}+ @SuppressWarnings("rawtypes")private void applyOrders(From<Build, Build> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder builder,EntityQuery<Build> buildQuery) {List<javax.persistence.criteria.Order> orders = new ArrayList<>();@@ -637,7 +639,18 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buielseorders.add(builder.desc(BuildQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));}- addOrderByIdIfNecessary(builder, root, orders);++ boolean found = false;+ for (var order: orders) {+ if (order.getExpression() instanceof SingularAttributePath+ && ((SingularAttributePath) order.getExpression()).getAttribute().getName().equals(Build.PROP_SUBMIT_DATE)) {+ found = true;+ break;+ }+ }+ if (!found)+ orders.add(builder.desc(root.get(Build.PROP_SUBMIT_DATE)));+criteriaQuery.orderBy(orders);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex 2f359ee1c6..699e7ce2da 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -32,6 +32,7 @@ import org.hibernate.Session;import org.hibernate.criterion.Criterion;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;+import org.hibernate.query.criteria.internal.path.SingularAttributePath;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;@@ -267,6 +268,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imreturn predicates.toArray(new Predicate[0]);}+ @SuppressWarnings("rawtypes")private CriteriaQuery<CodeComment> buildCriteriaQuery(Project project, Session session,PullRequest request, EntityQuery<CodeComment> commentQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();@@ -285,9 +287,21 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imorders.add(builder.desc(CodeCommentQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));}- if (orders.isEmpty())+ var found = false;+ for (var order: orders) {+ if (order.getExpression() instanceof SingularAttributePath) {+ var expr = (SingularAttributePath) order.getExpression();+ if (expr.getAttribute().getName().equals(LastActivity.PROP_DATE)+ && expr.getPathSource() instanceof SingularAttributePath+ && ((SingularAttributePath) expr.getPathSource()).getAttribute().getName().equals(CodeComment.PROP_LAST_ACTIVITY)) {+ found = true;+ break;+ }+ }+ }+ if (!found)orders.add(builder.desc(CodeCommentQuery.getPath(root, CodeComment.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE)));- addOrderByIdIfNecessary(builder, root, orders);+query.orderBy(orders);return query;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex c869781d26..efa720c13b 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -33,6 +33,7 @@ import javax.persistence.criteria.Subquery;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;+import org.hibernate.query.criteria.internal.path.SingularAttributePath;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -267,6 +268,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Issdao.persist(issue);}+ @SuppressWarnings("rawtypes")@Overridepublic List<javax.persistence.criteria.Order> buildOrders(List<EntitySort> sorts, CriteriaBuilder builder,From<Issue, Issue> issue,@@ -287,11 +289,22 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Issorders.add(builder.desc(join.get(IssueField.PROP_ORDINAL)));}}- if (orders.isEmpty())++ var found = false;+ for (var order: orders) {+ if (order.getExpression() instanceof SingularAttributePath) {+ var expr = (SingularAttributePath) order.getExpression();+ if (expr.getAttribute().getName().equals(LastActivity.PROP_DATE)+ && expr.getPathSource() instanceof SingularAttributePath+ && ((SingularAttributePath) expr.getPathSource()).getAttribute().getName().equals(Issue.PROP_LAST_ACTIVITY)) {+ found = true;+ break;+ }+ }+ }+ if (!found)orders.add(builder.desc(IssueQuery.getPath(issue, Issue.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE)));- addOrderByIdIfNecessary(builder, issue, orders);-return orders;}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 2097217f85..ccfa7dc131 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -88,6 +88,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.hibernate.Session;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;+import org.hibernate.query.criteria.internal.path.SingularAttributePath;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;import org.slf4j.Logger;@@ -1031,6 +1032,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>return count(true);}+ @SuppressWarnings("rawtypes")private CriteriaQuery<Project> buildCriteriaQuery(Session session, EntityQuery<Project> projectQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();CriteriaQuery<Project> query = builder.createQuery(Project.class);@@ -1047,9 +1049,20 @@ public class DefaultProjectManager extends BaseEntityManager<Project>orders.add(builder.desc(ProjectQuery.getPath(root, SORT_FIELDS.get(sort.getField()).getProperty())));}- if (orders.isEmpty())- orders.add(builder.asc(root.get(Project.PROP_PATH_LEN)));- addOrderByIdIfNecessary(builder, root, orders);+ var found = false;+ for (var order: orders) {+ if (order.getExpression() instanceof SingularAttributePath) {+ var expr = (SingularAttributePath) order.getExpression();+ if (expr.getAttribute().getName().equals(ProjectLastEventDate.PROP_ACTIVITY)+ && expr.getPathSource() instanceof SingularAttributePath+ && ((SingularAttributePath) expr.getPathSource()).getAttribute().getName().equals(Project.PROP_LAST_EVENT_DATE)) {+ found = true;+ break;+ }+ }+ }+ if (!found)+ orders.add(builder.desc(ProjectQuery.getPath(root, Project.PROP_LAST_EVENT_DATE + "." + ProjectLastEventDate.PROP_ACTIVITY)));query.orderBy(orders);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex a21c9faa7a..af644846cc 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -50,6 +50,7 @@ import org.hibernate.Session;import org.hibernate.criterion.Criterion;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;+import org.hibernate.query.criteria.internal.path.SingularAttributePath;import org.joda.time.DateTime;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -896,6 +897,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>return predicates.toArray(new Predicate[0]);}+ @SuppressWarnings("rawtypes")private CriteriaQuery<PullRequest> buildCriteriaQuery(Session session, @Nullable Project targetProject,EntityQuery<PullRequest> requestQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();@@ -917,9 +919,21 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>}}- if (orders.isEmpty())+ var found = false;+ for (var order: orders) {+ if (order.getExpression() instanceof SingularAttributePath) {+ var expr = (SingularAttributePath) order.getExpression();+ if (expr.getAttribute().getName().equals(LastActivity.PROP_DATE)+ && expr.getPathSource() instanceof SingularAttributePath+ && ((SingularAttributePath) expr.getPathSource()).getAttribute().getName().equals(PullRequest.PROP_LAST_ACTIVITY)) {+ found = true;+ break;+ }+ }+ }+ if (!found)orders.add(builder.desc(PullRequestQuery.getPath(root, PullRequest.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE)));- addOrderByIdIfNecessary(builder, root, orders);+query.orderBy(orders);return query;diff --git a/server-core/src/main/java/io/onedev/server/model/Group.java b/server-core/src/main/java/io/onedev/server/model/Group.javaindex f72a89080f..9ec725c648 100644--- a/server-core/src/main/java/io/onedev/server/model/Group.java+++ b/server-core/src/main/java/io/onedev/server/model/Group.java@@ -102,8 +102,7 @@ public class Group extends AbstractEntity implements BasePermission {this.createRootProjects = createRootProjects;}- @Editable(order=400, name="Enable Two-factor Authentication", description="Check this to enable "- + "two-factor authentication for all users in this group")+ @Editable(order=400, name="Enforce Two-factor Authentication", description="Check this to enforce two-factor authentication for all users in this group")public boolean isEnforce2FA() {return enforce2FA;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.javaindex 25d08e6c7c..1cb066e86b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java@@ -92,8 +92,7 @@ public class SecuritySetting implements Serializable {this.enableSelfDeregister = enableSelfDeregister;}- @Editable(order=400, name="Enable Two-factor Authentication", description="Check this to enable "- + "two-factor authentication for all users in the system")+ @Editable(order=400, name="Enforce Two-factor Authentication", description="Check this to enforce two-factor authentication for all users in the system")public boolean isEnforce2FA() {return enforce2FA;}diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/BaseEntityManager.java b/server-core/src/main/java/io/onedev/server/persistence/dao/BaseEntityManager.javaindex a938daa4ee..9db946c177 100644--- a/server-core/src/main/java/io/onedev/server/persistence/dao/BaseEntityManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/BaseEntityManager.java@@ -6,11 +6,6 @@ import org.hibernate.Session;import io.onedev.server.model.AbstractEntity;import io.onedev.server.util.ReflectionUtils;-import org.hibernate.query.criteria.internal.path.SingularAttributePath;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Order;public abstract class BaseEntityManager<T extends AbstractEntity> implements EntityManager<T> {@@ -98,18 +93,4 @@ public abstract class BaseEntityManager<T extends AbstractEntity> implements Entreturn entityClass;}- @SuppressWarnings("rawtypes")- protected void addOrderByIdIfNecessary(CriteriaBuilder builder, From<?, ?> from, List<Order> orders) {- boolean orderByIdFound = false;- for (var order: orders) {- if (order.getExpression() instanceof SingularAttributePath- && ((SingularAttributePath) order.getExpression()).getAttribute().getName().equals(AbstractEntity.PROP_ID)) {- orderByIdFound = true;- break;- }- }- if (!orderByIdFound)- orders.add(builder.desc(from.get(AbstractEntity.PROP_ID)));- }-}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 8b15f5c55c..f618d575ec 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@@ -732,15 +732,17 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>return true;}- public static IssueQuery merge(IssueQuery query1, IssueQuery query2) {+ public static IssueQuery merge(IssueQuery baseQuery, IssueQuery query) {List<Criteria<Issue>> criterias = new ArrayList<>();- if (query1.getCriteria() != null)- criterias.add(query1.getCriteria());- if (query2.getCriteria() != null)- criterias.add(query2.getCriteria());+ if (baseQuery.getCriteria() != null)+ criterias.add(baseQuery.getCriteria());+ if (query.getCriteria() != null)+ criterias.add(query.getCriteria());List<EntitySort> sorts = new ArrayList<>();- sorts.addAll(query1.getSorts());- sorts.addAll(query2.getSorts());++ // query sorts should take precedence over base query sorts+ sorts.addAll(query.getSorts());+ sorts.addAll(baseQuery.getSorts());return new IssueQuery(Criteria.andCriterias(criterias), sorts);}