The Unified and Autonomous Development Platform
Fix issue #833 - Page loads slowly when there are many projects (10k+)
Robin Shen326f3789e44b
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Import.java b/server-core/src/main/java/io/onedev/server/buildspec/Import.javaindex df2be566e7..a5393a703e 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/Import.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/Import.java@@ -33,6 +33,7 @@ import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.security.permission.ReadCode;import io.onedev.server.util.EditContext;import io.onedev.server.util.JobSecretAuthorizationContext;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.ChoiceProvider;@@ -84,9 +85,10 @@ public class Import implements Serializable, Validatable {private static List<String> getProjectChoices() {List<String> choices = new ArrayList<>();Project project = ((ProjectPage)WicketUtils.getPage()).getProject();- for (Project each: OneDev.getInstance(ProjectManager.class).getPermittedProjects(new AccessProject())) {- if (!each.equals(project))- choices.add(each.getPath());+ ProjectCollection projects = OneDev.getInstance(ProjectManager.class).getPermittedProjects(new AccessProject());+ for (Long projectId: projects.getIds()) {+ if (!projectId.equals(Project.idOf(project)))+ choices.add(projects.getCache().getPath(projectId));}Collections.sort(choices);diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex 9be28773b3..eac63dde87 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -64,6 +64,7 @@ import io.onedev.k8shelper.ServerSideFacade;import io.onedev.k8shelper.StepFacade;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.buildspec.BuildSpecParseException;import io.onedev.server.buildspec.Service;import io.onedev.server.buildspec.job.action.PostBuildAction;import io.onedev.server.buildspec.job.action.condition.ActionCondition;@@ -1074,6 +1075,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}}}+ } catch (BuildSpecParseException e) {+ logger.warn("Malformed build spec (project: {}, branch: {})",+ project.getPath(), defaultBranch);} finally {JobSecretAuthorizationContext.pop();}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.javaindex 07b0bb0e96..877090fb29 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java@@ -19,6 +19,7 @@ import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.EditContext;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;@@ -57,9 +58,11 @@ public class ProjectDependency implements Serializable {private static List<String> getProjectChoices() {List<String> choices = new ArrayList<>();Project project = ((ProjectPage)WicketUtils.getPage()).getProject();- for (Project each: OneDev.getInstance(ProjectManager.class).getPermittedProjects(new AccessProject())) {- if (!each.equals(project))- choices.add(each.getPath());+ ProjectCollection projects = OneDev.getInstance(ProjectManager.class)+ .getPermittedProjects(new AccessProject());+ for (Long projectId: projects.getIds()) {+ if (!projectId.equals(Project.idOf(project)))+ choices.add(projects.getCache().getPath(projectId));}Collections.sort(choices);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueAuthorizationManager.javaindex 767fe2e074..a112489f8e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueAuthorizationManager.java@@ -1,6 +1,9 @@package io.onedev.server.entitymanager;import io.onedev.server.model.IssueAuthorization;++import javax.annotation.Nullable;+import io.onedev.server.model.Issue;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityManager;@@ -9,4 +12,7 @@ public interface IssueAuthorizationManager extends EntityManager<IssueAuthorizatvoid authorize(Issue issue, User user);+ @Nullable+ IssueAuthorization find(Issue issue, User user);+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javaindex 961f3b8cc3..2b3c71ce63 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java@@ -14,6 +14,7 @@ import org.eclipse.jgit.lib.Repository;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.ProjectFacade;@@ -61,8 +62,6 @@ public interface ProjectManager extends EntityManager<Project> {Repository getRepository(Project project);- Collection<Project> getPermittedProjects(Permission permission);-List<Project> query(EntityQuery<Project> query, int firstResult, int maxResults);int count(Criteria<Project> criteria);@@ -75,8 +74,10 @@ public interface ProjectManager extends EntityManager<Project> {void delete(Collection<Project> projects);- Collection<Long> getProjectIds();+ Collection<Long> getIds();Collection<Long> getSubtreeIds(Long projectId);+ ProjectCollection getPermittedProjects(Permission permission);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueAuthorizationManager.javaindex 3c880579d2..4df2493e26 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueAuthorizationManager.java@@ -5,6 +5,8 @@ import java.util.List;import javax.inject.Inject;import javax.inject.Singleton;+import org.hibernate.criterion.Restrictions;+import io.onedev.server.entitymanager.IssueAuthorizationManager;import io.onedev.server.model.IssueAuthorization;import io.onedev.server.model.Issue;@@ -12,6 +14,7 @@ import io.onedev.server.model.User;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;@Singletonpublic class DefaultIssueAuthorizationManager extends BaseEntityManager<IssueAuthorization>@@ -50,5 +53,13 @@ public class DefaultIssueAuthorizationManager extends BaseEntityManager<IssueAutsave(authorization);}}++ @Override+ public IssueAuthorization find(Issue issue, User user) {+ EntityCriteria<IssueAuthorization> criteria = EntityCriteria.of(IssueAuthorization.class);+ criteria.add(Restrictions.eq(IssueAuthorization.PROP_ISSUE, issue));+ criteria.add(Restrictions.eq(IssueAuthorization.PROP_USER, user));+ return find(criteria);+ }}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 1aeeb51669..a24ea19d53 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@@ -12,7 +12,6 @@ import java.util.concurrent.locks.ReadWriteLock;import java.util.concurrent.locks.ReentrantReadWriteLock;import java.util.regex.Matcher;import java.util.regex.Pattern;-import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.inject.Inject;@@ -392,9 +391,8 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss}predicates.add(builder.or(projectPredicates.toArray(new Predicate[0])));} else if (!SecurityUtils.isAdministrator()) {- Collection<Project> projects = projectManager.getPermittedProjects(new AccessProject());- if (!projects.isEmpty()) {- Collection<Long> projectIds = projects.stream().map(it->it.getId()).collect(Collectors.toList());+ Collection<Long> projectIds = projectManager.getPermittedProjects(new AccessProject()).getIds();+ if (!projectIds.isEmpty()) {predicates.add(builder.or(getPredicate(builder, root, projectIds),getAuthorizationPredicate(query, builder, root, projectIds)));@@ -426,7 +424,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssPredicate userPredicate = builder.equal(authorizationRoot.get(IssueAuthorization.PROP_USER), user);Path<Long> projectIdPath = root.get(Issue.PROP_PROJECT).get(Project.PROP_ID);return builder.and(- Criteria.forManyValues(builder, projectIdPath, projectIds, projectManager.getProjectIds()),+ Criteria.forManyValues(builder, projectIdPath, projectIds, projectManager.getIds()),builder.exists(authorizationQuery.where(issuePredicate, userPredicate)));} else {return builder.disjunction();@@ -451,7 +449,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss}private Predicate getPredicate(CriteriaBuilder builder, Root<Issue> root, Collection<Long> projectIds) {- Collection<Long> allIds = projectManager.getProjectIds();+ Collection<Long> allIds = projectManager.getIds();Path<Project> projectPath = root.get(Issue.PROP_PROJECT);Path<Long> projectIdPath = projectPath.get(Project.PROP_ID);if (SecurityUtils.isAdministrator()) {@@ -1010,7 +1008,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Issprivate Predicate getSubtreePredicate(CriteriaBuilder builder, Path<Project> projectPath, Project project) {Collection<Long> subtreeIds = projectManager.getSubtreeIds(project.getId());- Collection<Long> allIds = projectManager.getProjectIds();+ Collection<Long> allIds = projectManager.getIds();return Criteria.forManyValues(builder, projectPath.get(Project.PROP_ID), subtreeIds, allIds);}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 cf65b4d1d9..4a016ef146 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@@ -1,15 +1,11 @@package io.onedev.server.entitymanager.impl;-import static java.util.stream.Collectors.toList;-import java.io.File;import java.io.IOException;import java.io.InputStream;import java.nio.charset.Charset;import java.util.ArrayList;import java.util.Collection;-import java.util.Collections;-import java.util.Comparator;import java.util.Date;import java.util.HashMap;import java.util.HashSet;@@ -21,7 +17,6 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.locks.Lock;import java.util.concurrent.locks.ReadWriteLock;import java.util.concurrent.locks.ReentrantReadWriteLock;-import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.inject.Inject;@@ -81,11 +76,14 @@ import io.onedev.server.git.RefInfo;import io.onedev.server.git.command.CloneCommand;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build;+import io.onedev.server.model.Group;+import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Issue;import io.onedev.server.model.LinkSpec;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.Role;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.BranchProtection;@@ -103,10 +101,10 @@ 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.security.permission.ProjectPermission;+import io.onedev.server.util.ProjectCache;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.schedule.SchedulableTask;import io.onedev.server.util.schedule.TaskScheduler;@@ -151,7 +149,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>private final Map<Long, Date> updateDates = new ConcurrentHashMap<>();- private final Map<Long, ProjectFacade> cache = new HashMap<>();+ private final ProjectCache cache = new ProjectCache(new HashMap<>());private final ReadWriteLock cacheLock = new ReentrantReadWriteLock();@@ -294,7 +292,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>public void run() {cacheLock.writeLock().lock();try {- cache.put(facade.getId(), facade);+ cache.cache(facade);} finally {cacheLock.writeLock().unlock();}@@ -370,7 +368,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>public Project findByPath(String path) {cacheLock.readLock().lock();try {- Long projectId = findProjectId(path);+ Long projectId = cache.findId(path);if (projectId != null)return load(projectId);else@@ -380,24 +378,13 @@ public class DefaultProjectManager extends BaseEntityManager<Project>}}- @Nullable- private Long findProjectId(String path) {- Long projectId = null;- for (String name: Splitter.on("/").omitEmptyStrings().trimResults().split(path)) {- projectId = findProjectId(projectId, name);- if (projectId == null)- break;- }- return projectId;- }-@Sessional@Overridepublic Project findByServiceDeskName(String serviceDeskName) {cacheLock.readLock().lock();try {Long projectId = null;- for (ProjectFacade facade: cache.values()) {+ for (ProjectFacade facade: cache.getAll()) {if (serviceDeskName.equals(facade.getServiceDeskName())) {projectId = facade.getId();break;@@ -454,8 +441,9 @@ public class DefaultProjectManager extends BaseEntityManager<Project>cacheLock.readLock().lock();try {Long projectId = null;- for (ProjectFacade facade: cache.values()) {- if (facade.getName().equalsIgnoreCase(name) && Objects.equals(Project.idOf(parent), facade.getParentId())) {+ for (ProjectFacade facade: cache.getAll()) {+ if (facade.getName().equalsIgnoreCase(name)+ && Objects.equals(Project.idOf(parent), facade.getParentId())) {projectId = facade.getId();break;}@@ -673,7 +661,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>cacheLock.writeLock().lock();try {for (Project project: query()) {- cache.put(project.getId(), project.getFacade());+ cache.cache(project.getFacade());checkSanity(project);}} finally {@@ -785,14 +773,73 @@ public class DefaultProjectManager extends BaseEntityManager<Project>return count(true);}- @Sessional+ private void addSubTreeIds(Collection<Long> projectIds, Project project) {+ projectIds.add(project.getId());+ for (Project descendant: project.getDescendants())+ projectIds.add(descendant.getId());+ }+@Override- public Collection<Project> getPermittedProjects(Permission permission) {- return query().stream()- .filter(it->SecurityUtils.getSubject().isPermitted(new ProjectPermission(it, permission)))- .collect(toList());+ public ProjectCollection getPermittedProjects(Permission permission) {+ ProjectCache cacheClone;+ cacheLock.readLock().lock();+ try {+ cacheClone = cache.clone();+ } finally {+ cacheLock.readLock().unlock();+ }++ Collection<Long> permittedProjectIds;+ User user = SecurityUtils.getUser();+ if (user != null) {+ if (user.isRoot() || user.isSystem()) {+ return new ProjectCollection(cacheClone, new ArrayList<>(cacheClone.getIds()));+ } else {+ permittedProjectIds = new HashSet<>();+ for (Group group: user.getGroups()) {+ if (group.isAdministrator())+ return new ProjectCollection(cacheClone, new ArrayList<>(cacheClone.getIds()));+ for (GroupAuthorization authorization: group.getAuthorizations()) {+ if (authorization.getRole().implies(permission))+ addSubTreeIds(permittedProjectIds, authorization.getProject());+ }+ }+ Group defaultLoginGroup = settingManager.getSecuritySetting().getDefaultLoginGroup();+ if (defaultLoginGroup != null) {+ if (defaultLoginGroup.isAdministrator())+ return new ProjectCollection(cacheClone, new ArrayList<>(cacheClone.getIds()));+ for (GroupAuthorization authorization: defaultLoginGroup.getAuthorizations()) {+ if (authorization.getRole().implies(permission))+ addSubTreeIds(permittedProjectIds, authorization.getProject());+ }+ }++ for (UserAuthorization authorization: user.getProjectAuthorizations()) {+ if (authorization.getRole().implies(permission))+ addSubTreeIds(permittedProjectIds, authorization.getProject());+ }+ addIdsPermittedByDefaultRole(cacheClone, permittedProjectIds, permission);+ }+ } else {+ permittedProjectIds = new HashSet<>();+ if (settingManager.getSecuritySetting().isEnableAnonymousAccess())+ addIdsPermittedByDefaultRole(cacheClone, permittedProjectIds, permission);+ }+ permittedProjectIds.retainAll(cacheClone.getIds());+ return new ProjectCollection(cacheClone, new ArrayList<>(permittedProjectIds));+ }++ private void addIdsPermittedByDefaultRole(ProjectCache cache, Collection<Long> projectIds,+ Permission permission) {+ for (ProjectFacade project: cache.getAll()) {+ if (project.getDefaultRoleId() != null) {+ Role defaultRole = roleManager.load(project.getDefaultRoleId());+ if (defaultRole.implies(permission))+ projectIds.addAll(cache.getSubtreeIds(project.getId()));+ }+ }}-+private CriteriaQuery<Project> buildCriteriaQuery(Session session, EntityQuery<Project> projectQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();CriteriaQuery<Project> query = builder.createQuery(Project.class);@@ -820,12 +867,10 @@ public class DefaultProjectManager extends BaseEntityManager<Project>From<Project, Project> from, CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();if (!SecurityUtils.isAdministrator()) {- Collection<Project> projects = getPermittedProjects(new AccessProject());- if (!projects.isEmpty()) {- Collection<Long> allIds = getProjectIds();- Collection<Long> projectIds =- projects.stream().map(it->it.getId()).collect(Collectors.toList());- predicates.add(Criteria.forManyValues(builder, from.get(Project.PROP_ID), projectIds, allIds));+ ProjectCollection collection = getPermittedProjects(new AccessProject());+ if (!collection.getIds().isEmpty()) {+ predicates.add(Criteria.forManyValues(builder, from.get(Project.PROP_ID),+ collection.getIds(), collection.getCache().getIds()));} else {predicates.add(builder.disjunction());}@@ -882,59 +927,27 @@ public class DefaultProjectManager extends BaseEntityManager<Project>logger.error("Error flushing project update dates", e);}}-+@Overridepublic ScheduleBuilder<?> getScheduleBuilder() {return SimpleScheduleBuilder.repeatMinutelyForever();}- private String getPath(Long id) {- ProjectFacade facade = cache.get(id);- if (facade != null) {- if (facade.getParentId() != null) {- String parentPath = getPath(facade.getParentId());- if (parentPath != null)- return parentPath + "/" + facade.getName();- else- return null;- } else {- return facade.getName();- }- } else {- return null;- }- }-- private Collection<Long> getMatchingIds(String pathPattern) {- Collection<Long> ids = new HashSet<>();- for (Long id: cache.keySet()) {- String path = getPath(id);- if (path != null && WildcardUtils.matchPath(pathPattern, path))- ids.add(id);- }- return ids;- }-@Overridepublic Collection<Long> getSubtreeIds(Long projectId) {cacheLock.readLock().lock();try {- Collection<Long> treeIds = Sets.newHashSet(projectId);- for (ProjectFacade facade: cache.values()) {- if (projectId.equals(facade.getParentId()))- treeIds.addAll(getSubtreeIds(facade.getId()));- }- return treeIds;+ return cache.getSubtreeIds(projectId);} finally {cacheLock.readLock().unlock();}}@Override- public Collection<Long> getProjectIds() {+ public Collection<Long> getIds() {cacheLock.readLock().lock();try {- return new HashSet<>(cache.keySet());+ return new HashSet<>(cache.getIds());} finally {cacheLock.readLock().unlock();}@@ -945,7 +958,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>cacheLock.readLock().lock();try {return Criteria.forManyValues(builder, path.get(Project.PROP_ID),- getMatchingIds(pathPattern), cache.keySet());+ cache.getMatchingIds(pathPattern), cache.getIds());} finally {cacheLock.readLock().unlock();}@@ -978,33 +991,11 @@ public class DefaultProjectManager extends BaseEntityManager<Project>delete(independent);}- @Nullable- private Long findProjectId(@Nullable Long parentId, String name) {- for (ProjectFacade facade: cache.values()) {- if (facade.getName().equalsIgnoreCase(name) && Objects.equals(parentId, facade.getParentId()))- return facade.getId();- }- return null;- }-@Overridepublic List<ProjectFacade> getChildren(Long projectId) {cacheLock.readLock().lock();try {- List<ProjectFacade> children = new ArrayList<>();- for (ProjectFacade facade: cache.values()) {- if (projectId.equals(facade.getParentId()))- children.add(facade);- }- Collections.sort(children, new Comparator<ProjectFacade>() {-- @Override- public int compare(ProjectFacade o1, ProjectFacade o2) {- return o1.getName().compareTo(o2.getName());- }-- });- return children;+ return cache.getChildren(projectId);} finally {cacheLock.readLock().unlock();}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 2b95aeaa08..cf7e23f724 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@@ -128,6 +128,7 @@ 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.util.ProjectAndBranch;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.util.ProjectPullRequestStats;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.concurrent.BatchWorkManager;@@ -887,13 +888,11 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imif (targetProject != null) {predicates.add(builder.equal(from.get(PullRequest.PROP_TARGET_PROJECT), targetProject));} else if (!SecurityUtils.isAdministrator()) {- Collection<Project> projects = projectManager.getPermittedProjects(new ReadCode());- if (!projects.isEmpty()) {- Collection<Long> allIds = projectManager.getProjectIds();- Collection<Long> projectIds =- projects.stream().map(it->it.getId()).collect(Collectors.toList());+ ProjectCollection projects = projectManager.getPermittedProjects(new ReadCode());+ if (!projects.getIds().isEmpty()) {Path<Long> projectIdPath = from.get(PullRequest.PROP_TARGET_PROJECT).get(Project.PROP_ID);- predicates.add(Criteria.forManyValues(builder, projectIdPath, projectIds, allIds));+ predicates.add(Criteria.forManyValues(builder, projectIdPath, projects.getIds(),+ projects.getCache().getIds()));} else {predicates.add(builder.disjunction());}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/AbstractSingleEnvironmentManager.java b/server-core/src/main/java/io/onedev/server/infomanager/AbstractSingleEnvironmentManager.javaindex 0cb1ce7638..cfd4dd68ff 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/AbstractSingleEnvironmentManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/AbstractSingleEnvironmentManager.java@@ -18,7 +18,8 @@ public abstract class AbstractSingleEnvironmentManager extends AbstractEnvironme@Listenpublic synchronized void on(SystemStopping event) {- env.close();+ if (env != null)+ env.close();}protected abstract File getEnvDir();diff --git a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.javaindex a2fee3caf5..250c8dce60 100644--- a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java+++ b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java@@ -121,7 +121,8 @@ public abstract class AbstractEntity implements Serializable, Comparable<Abstrac* @param entity* @return*/- public static @Nullable Long idOf(@Nullable AbstractEntity entity) {+ @Nullable+ public static Long idOf(@Nullable AbstractEntity entity) {if (entity == null) {return null;} else if (entity instanceof HibernateProxy) {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 a107e451ab..ae5267a7d3 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@@ -9,10 +9,13 @@ import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.OneToMany;+import org.apache.shiro.authz.Permission;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.security.permission.CreateRootProjects;+import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.ShowCondition;@@ -20,7 +23,7 @@ import io.onedev.server.web.editable.annotation.ShowCondition;@Entity@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editable-public class Group extends AbstractEntity {+public class Group extends AbstractEntity implements Permission {private static final long serialVersionUID = 1L;@@ -130,5 +133,20 @@ public class Group extends AbstractEntity {Group group = (Group) entity;return getName().compareTo(group.getName());}++ @Override+ public boolean implies(Permission p) {+ if (isAdministrator())+ return true;+ if (isCreateRootProjects() && new CreateRootProjects().implies(p))+ return true;+ if (p instanceof ProjectPermission) {+ for (GroupAuthorization authorization: getAuthorizations()) {+ if (new ProjectPermission(authorization.getProject(), authorization.getRole()).implies(p))+ return true;+ }+ }+ return false;+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 58a07c517d..8108cc8230 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -701,7 +701,8 @@ public class Project extends AbstractEntity {}public ProjectFacade getFacade() {- return new ProjectFacade(getId(), getName(), getServiceDeskName(), Project.idOf(getParent()));+ return new ProjectFacade(getId(), getName(), getServiceDeskName(), isIssueManagement(),+ Role.idOf(getDefaultRole()), Project.idOf(getParent()));}/**diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.javaindex dec9246c98..1c4ba4e8ab 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java@@ -6,7 +6,6 @@ import java.util.Collection;import java.util.HashMap;import java.util.List;import java.util.Map;-import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.inject.Inject;@@ -134,13 +133,11 @@ public class DefaultIssueTextManager extends EntityTextManager<Issue> implementsprojectQueryBuilder.setMinimumNumberShouldMatch(1);queryBuilder.add(projectQueryBuilder.build(), Occur.MUST);} else if (!SecurityUtils.isAdministrator()) {- Collection<Project> projects = projectManager.getPermittedProjects(new AccessProject());- if (!projects.isEmpty()) {- Collection<Long> projectIds = projects.stream().map(it->it.getId()).collect(Collectors.toList());+ Collection<Long> projectIds = projectManager.getPermittedProjects(new AccessProject()).getIds();+ if (!projectIds.isEmpty())queryBuilder.add(buildQuery(projectIds), Occur.MUST);- } else {+ elsereturn null;- }}BooleanQuery.Builder contentQueryBuilder = new BooleanQuery.Builder();@@ -172,7 +169,7 @@ public class DefaultIssueTextManager extends EntityTextManager<Issue> implements}private Query buildQuery(Collection<Long> projectIds) {- Collection<Long> allIds = projectManager.getProjectIds();+ Collection<Long> allIds = projectManager.getIds();if (SecurityUtils.isAdministrator()) {return Criteria.forManyValues(FIELD_PROJECT_ID, projectIds, allIds);} else {diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.javaindex 51b492bb35..792ce4e078 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java@@ -6,7 +6,6 @@ import java.util.Collection;import java.util.HashMap;import java.util.List;import java.util.Map;-import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.inject.Inject;@@ -37,6 +36,7 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ReadCode;import io.onedev.server.storage.StorageManager;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.util.concurrent.BatchWorkManager;import io.onedev.server.util.criteria.Criteria;@@ -113,11 +113,10 @@ public class DefaultPullRequestTextManager extends EntityTextManager<PullRequestif (project != null) {queryBuilder.add(LongPoint.newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.MUST);} else if (!SecurityUtils.isAdministrator()) {- Collection<Project> projects = projectManager.getPermittedProjects(new ReadCode());- if (!projects.isEmpty()) {- Collection<Long> projectIds = projects.stream().map(it->it.getId()).collect(Collectors.toList());- Collection<Long> allIds = projectManager.getProjectIds();- queryBuilder.add(Criteria.forManyValues(FIELD_PROJECT_ID, projectIds, allIds), Occur.MUST);+ ProjectCollection projects = projectManager.getPermittedProjects(new ReadCode());+ if (!projects.getIds().isEmpty()) {+ Collection<Long> allIds = projects.getCache().getIds();+ queryBuilder.add(Criteria.forManyValues(FIELD_PROJECT_ID, projects.getIds(), allIds), Occur.MUST);} else {return null;}diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex 02fb3d732b..86032d54b7 100644--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -114,7 +114,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {return true;} else {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- return !projectManager.getPermittedProjects(new CreateChildren()).isEmpty();+ return !projectManager.getPermittedProjects(new CreateChildren()).getIds().isEmpty();}}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ConfidentialIssuePermission.java b/server-core/src/main/java/io/onedev/server/security/permission/ConfidentialIssuePermission.javaindex 58b9d44fff..c2597b9238 100644--- a/server-core/src/main/java/io/onedev/server/security/permission/ConfidentialIssuePermission.java+++ b/server-core/src/main/java/io/onedev/server/security/permission/ConfidentialIssuePermission.java@@ -22,4 +22,8 @@ public class ConfidentialIssuePermission implements Permission {}}+ public Issue getIssue() {+ return issue;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java b/server-core/src/main/java/io/onedev/server/security/permission/ProjectPermission.javaindex 2e405dfd0a..ff9e3b674a 100644--- a/server-core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java+++ b/server-core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java@@ -15,6 +15,14 @@ public class ProjectPermission implements Permission {this.privilege = privilege;}+ public Project getProject() {+ return project;+ }++ public Permission getPrivilege() {+ return privilege;+ }+@Overridepublic boolean implies(Permission p) {if (p instanceof ProjectPermission) {diff --git a/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.javaindex 75f153114c..6cb372cacb 100644--- a/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java@@ -18,20 +18,17 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.entitymanager.EmailAddressManager;import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.IssueAuthorizationManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.IssueAuthorization;import io.onedev.server.model.Group;-import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.persistence.SessionManager;import io.onedev.server.security.permission.ConfidentialIssuePermission;-import io.onedev.server.security.permission.CreateRootProjects;import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.security.permission.UserAdministration;public abstract class AbstractAuthorizingRealm extends AuthorizingRealm {@@ -46,6 +43,8 @@ public abstract class AbstractAuthorizingRealm extends AuthorizingRealm {protected final SessionManager sessionManager;+ private final IssueAuthorizationManager issueAuthorizationManager;+protected final SettingManager settingManager;@SuppressWarnings("serial")@@ -55,58 +54,70 @@ public abstract class AbstractAuthorizingRealm extends AuthorizingRealm {@Injectpublic AbstractAuthorizingRealm(UserManager userManager, GroupManager groupManager,ProjectManager projectManager, SessionManager sessionManager,- SettingManager settingManager, EmailAddressManager emailAddressManager) {+ SettingManager settingManager, EmailAddressManager emailAddressManager,+ IssueAuthorizationManager issueAuthorizationManager) {this.userManager = userManager;this.groupManager = groupManager;this.projectManager = projectManager;this.sessionManager = sessionManager;this.settingManager = settingManager;this.emailAddressManager = emailAddressManager;+ this.issueAuthorizationManager = issueAuthorizationManager;}- private Collection<Permission> getGroupPermissions(Group group, User user) {- Collection<Permission> permissions = new ArrayList<>();- if (group.isAdministrator())- permissions.add(new SystemAdministration());- else if (group.isCreateRootProjects())- permissions.add(new CreateRootProjects());- for (GroupAuthorization authorization: group.getAuthorizations())- permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));- return permissions;- }-private AuthorizationInfo newAuthorizationInfo(Long userId) {Collection<Permission> permissions = sessionManager.call(new Callable<Collection<Permission>>() {@Overridepublic Collection<Permission> call() throws Exception {Collection<Permission> permissions = new ArrayList<>();+ permissions.add(new Permission() {- if (userId != 0L) {- User user = userManager.load(userId);- if (user.isRoot() || user.isSystem())- permissions.add(new SystemAdministration());- permissions.add(new UserAdministration(user));- for (Group group: user.getGroups())- permissions.addAll(getGroupPermissions(group, user));- Group defaultLoginGroup = settingManager.getSecuritySetting().getDefaultLoginGroup();- if (defaultLoginGroup != null)- permissions.addAll(getGroupPermissions(defaultLoginGroup, user));-- for (UserAuthorization authorization: user.getProjectAuthorizations())- permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));- for (IssueAuthorization authorization: user.getIssueAuthorizations()) {- permissions.add(new ProjectPermission(- authorization.getIssue().getProject(),- new ConfidentialIssuePermission(authorization.getIssue())));- }- }- if (userId != 0L || settingManager.getSecuritySetting().isEnableAnonymousAccess()) {- for (Project project: projectManager.query()) {- if (project.getDefaultRole() != null)- permissions.add(new ProjectPermission(project, project.getDefaultRole()));- }- }+ @Override+ public boolean implies(Permission p) {+ if (userId != 0L) {+ User user = userManager.load(userId);+ if (user.isRoot() || user.isSystem())+ return true;+ if (new UserAdministration(user).implies(p))+ return true;+ for (Group group: user.getGroups()) {+ if (group.implies(p))+ return true;+ }+ Group defaultLoginGroup = settingManager.getSecuritySetting().getDefaultLoginGroup();+ if (defaultLoginGroup != null && defaultLoginGroup.implies(p))+ return true;++ if (p instanceof ProjectPermission) {+ ProjectPermission projectPermission = (ProjectPermission) p;+ if (projectPermission.getPrivilege() instanceof ConfidentialIssuePermission) {+ ConfidentialIssuePermission confidentialIssuePermission =+ (ConfidentialIssuePermission) projectPermission.getPrivilege();+ if (issueAuthorizationManager.find(confidentialIssuePermission.getIssue(), user) != null)+ return true;+ }+ for (UserAuthorization authorization: user.getProjectAuthorizations()) {+ if (new ProjectPermission(authorization.getProject(), authorization.getRole()).implies(p))+ return true;+ }+ }+ }+ if (p instanceof ProjectPermission+ && (userId != 0L || settingManager.getSecuritySetting().isEnableAnonymousAccess())) {+ ProjectPermission projectPermission = (ProjectPermission) p;+ Project project = projectPermission.getProject();+ Permission privilege = projectPermission.getPrivilege();+ do {+ if (project.getDefaultRole() != null && project.getDefaultRole().implies(privilege))+ return true;+ project = project.getParent();+ } while (project != null);+ }+ return false;+ }++ });return permissions;}diff --git a/server-core/src/main/java/io/onedev/server/security/realm/BearerAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/BearerAuthorizingRealm.javaindex e30ee25278..b5930be62b 100644--- a/server-core/src/main/java/io/onedev/server/security/realm/BearerAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/realm/BearerAuthorizingRealm.java@@ -10,6 +10,7 @@ import org.apache.shiro.authc.credential.AllowAllCredentialsMatcher;import io.onedev.server.entitymanager.EmailAddressManager;import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.IssueAuthorizationManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;@@ -22,9 +23,10 @@ public class BearerAuthorizingRealm extends AbstractAuthorizingRealm {@Injectpublic BearerAuthorizingRealm(UserManager userManager, GroupManager groupManager,ProjectManager projectManager, SessionManager sessionManager,- SettingManager settingManager, EmailAddressManager emailAddressManager) {+ SettingManager settingManager, EmailAddressManager emailAddressManager,+ IssueAuthorizationManager issueAuthorizationManager) {super(userManager, groupManager, projectManager, sessionManager,- settingManager, emailAddressManager);+ settingManager, emailAddressManager, issueAuthorizationManager);setCredentialsMatcher(new AllowAllCredentialsMatcher());}diff --git a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.javaindex cc7d7bd43c..3a7b48ad65 100644--- a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java@@ -22,6 +22,7 @@ import com.google.common.collect.Sets;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.server.entitymanager.EmailAddressManager;import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.IssueAuthorizationManager;import io.onedev.server.entitymanager.MembershipManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;@@ -50,9 +51,10 @@ public class PasswordAuthorizingRealm extends AbstractAuthorizingRealm {MembershipManager membershipManager, GroupManager groupManager,ProjectManager projectManager, SessionManager sessionManager,TransactionManager transactionManager, SshKeyManager sshKeyManager,- PasswordService passwordService, EmailAddressManager emailAddressManager) {+ PasswordService passwordService, EmailAddressManager emailAddressManager,+ IssueAuthorizationManager issueAuthorizationManager) {super(userManager, groupManager, projectManager, sessionManager,- settingManager, emailAddressManager);+ settingManager, emailAddressManager, issueAuthorizationManager);PasswordMatcher passwordMatcher = new PasswordMatcher();passwordMatcher.setPasswordService(passwordService);diff --git a/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.javaindex fa94892c62..799e3bce5b 100644--- a/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java@@ -15,6 +15,7 @@ import com.google.common.collect.Sets;import io.onedev.server.entitymanager.EmailAddressManager;import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.IssueAuthorizationManager;import io.onedev.server.entitymanager.MembershipManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;@@ -39,8 +40,10 @@ public class SsoAuthorizingRealm extends AbstractAuthorizingRealm {public SsoAuthorizingRealm(UserManager userManager, MembershipManager membershipManager,GroupManager groupManager, ProjectManager projectManager, SessionManager sessionManager,TransactionManager transactionManager, SshKeyManager sshKeyManager,- SettingManager settingManager, EmailAddressManager emailAddressManager) {- super(userManager, groupManager, projectManager, sessionManager, settingManager, emailAddressManager);+ SettingManager settingManager, EmailAddressManager emailAddressManager,+ IssueAuthorizationManager issueAuthorizationManager) {+ super(userManager, groupManager, projectManager, sessionManager, settingManager,+ emailAddressManager, issueAuthorizationManager);setCredentialsMatcher(new AllowAllCredentialsMatcher());this.membershipManager = membershipManager;diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectCache.java b/server-core/src/main/java/io/onedev/server/util/ProjectCache.javanew file mode 100644index 0000000000..aec6220bd6--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/ProjectCache.java@@ -0,0 +1,140 @@+package io.onedev.server.util;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;+import java.util.HashSet;+import java.util.List;+import java.util.Map;+import java.util.Objects;++import javax.annotation.Nullable;++import com.google.common.base.Splitter;+import com.google.common.collect.Sets;++import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.util.match.WildcardUtils;++public class ProjectCache {++ private final Map<Long, ProjectFacade> projects;++ public ProjectCache(Map<Long, ProjectFacade> projects) {+ this.projects = projects;+ }++ public boolean isSelfOrAncestorOf(Long parentId, Long childId) {+ if (parentId.equals(childId)) {+ return true;+ } else {+ ProjectFacade childProject = projects.get(childId);+ if (childProject.getParentId() != null)+ return isSelfOrAncestorOf(parentId, childProject.getParentId());+ else+ return false;+ }+ }++ public Collection<Long> getIds() {+ return projects.keySet();+ }++ public Collection<ProjectFacade> getAll() {+ return projects.values();+ }++ @Nullable+ public ProjectFacade get(Long id) {+ return projects.get(id);+ }++ public void cache(ProjectFacade project) {+ projects.put(project.getId(), project);+ }++ public void remove(Long id) {+ projects.remove(id);+ }++ @Nullable+ public String getPath(Long id) {+ ProjectFacade project = projects.get(id);+ if (project != null) {+ if (project.getParentId() != null) {+ String parentPath = getPath(project.getParentId());+ if (parentPath != null)+ return parentPath + "/" + project.getName();+ else+ return null;+ } else {+ return project.getName();+ }+ } else {+ return null;+ }+ }++ public Collection<Long> getMatchingIds(String pathPattern) {+ Collection<Long> ids = new HashSet<>();+ for (Long id: projects.keySet()) {+ String path = getPath(id);+ if (path != null && WildcardUtils.matchPath(pathPattern, path))+ ids.add(id);+ }+ return ids;+ }++ public Collection<Long> getSubtreeIds(Long id) {+ Collection<Long> treeIds = Sets.newHashSet(id);+ for (ProjectFacade facade: projects.values()) {+ if (id.equals(facade.getParentId()))+ treeIds.addAll(getSubtreeIds(facade.getId()));+ }+ return treeIds;+ }++ @Nullable+ public Long findId(String path) {+ Long projectId = null;+ for (String name: Splitter.on("/").omitEmptyStrings().trimResults().split(path)) {+ projectId = findId(projectId, name);+ if (projectId == null)+ break;+ }+ return projectId;+ }++ @Nullable+ public Long findId(@Nullable Long parentId, String name) {+ for (ProjectFacade project: projects.values()) {+ if (project.getName().equalsIgnoreCase(name) && Objects.equals(parentId, project.getParentId()))+ return project.getId();+ }+ return null;+ }++ public List<ProjectFacade> getChildren(Long id) {+ List<ProjectFacade> children = new ArrayList<>();+ for (ProjectFacade facade: projects.values()) {+ if (id.equals(facade.getParentId()))+ children.add(facade);+ }+ Collections.sort(children, new Comparator<ProjectFacade>() {++ @Override+ public int compare(ProjectFacade o1, ProjectFacade o2) {+ return o1.getName().compareTo(o2.getName());+ }++ });+ return children;+ }++ @Override+ public ProjectCache clone() {+ return new ProjectCache(projects);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectCollection.java b/server-core/src/main/java/io/onedev/server/util/ProjectCollection.javanew file mode 100644index 0000000000..fe01d61c8b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/ProjectCollection.java@@ -0,0 +1,37 @@+package io.onedev.server.util;++import java.util.Collections;+import java.util.Comparator;+import java.util.List;++public class ProjectCollection {++ private final ProjectCache cache;++ private final List<Long> ids;++ public ProjectCollection(ProjectCache cache, List<Long> ids) {+ this.cache = cache;+ this.ids = ids;+ }++ public ProjectCache getCache() {+ return cache;+ }++ public List<Long> getIds() {+ return ids;+ }++ public void sortByPath() {+ Collections.sort(ids, new Comparator<Long>() {++ @Override+ public int compare(Long o1, Long o2) {+ return cache.getPath(o1).compareTo(cache.getPath(o2));+ }++ });+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.javaindex 46e236c97f..227e08f5bd 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java@@ -10,12 +10,19 @@ public class ProjectFacade extends EntityFacade {private final String serviceDeskName;+ private final boolean issueManagement;++ private final Long roleId;+private final Long parentId;- public ProjectFacade(Long id, String name, @Nullable String serviceDeskName, @Nullable Long parentId) {+ public ProjectFacade(Long id, String name, @Nullable String serviceDeskName,+ boolean issueManagement, @Nullable Long roleId, @Nullable Long parentId) {super(id);this.name = name;this.serviceDeskName = serviceDeskName;+ this.issueManagement = issueManagement;+ this.roleId = roleId;this.parentId = parentId;}@@ -23,11 +30,20 @@ public class ProjectFacade extends EntityFacade {return name;}+ public boolean isIssueManagement() {+ return issueManagement;+ }+@Nullablepublic String getServiceDeskName() {return serviceDeskName;}+ @Nullable+ public Long getDefaultRoleId() {+ return roleId;+ }+@Nullablepublic Long getParentId() {return parentId;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.javaindex 7646ea546a..ee606551eb 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@@ -27,6 +27,7 @@ import io.onedev.server.search.entity.project.ProjectQueryLexer;import io.onedev.server.search.entity.project.ProjectQueryParser;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.DateUtils;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -96,10 +97,10 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {} else if (fieldName.equals(Project.NAME_SERVICE_DESK_NAME)) {if (!matchWith.contains("*")) {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- List<String> serviceDeskNames = projectManager.getPermittedProjects(new AccessProject())- .stream()- .filter(it->it.getServiceDeskName() != null)- .map(it->it.getServiceDeskName())+ ProjectCollection projects = projectManager.getPermittedProjects(new AccessProject());+ List<String> serviceDeskNames = projects.getIds().stream()+ .map(it->projects.getCache().get(it).getServiceDeskName())+ .filter(it-> it != null).sorted().collect(Collectors.toList());return SuggestionUtils.suggest(serviceDeskNames, matchWith);diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.javaindex dd52ac8fbc..010613ba65 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java@@ -1,8 +1,8 @@package io.onedev.server.web.component.branch.picker;-import java.util.Collection;import java.util.Iterator;import java.util.List;+import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -14,7 +14,8 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ReadCode;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.web.component.project.ProjectPicker;@SuppressWarnings("serial")@@ -63,18 +64,21 @@ public abstract class AffinalBranchPicker extends Panel {protected void onInitialize() {super.onInitialize();- add(new ProjectPicker("projectPicker", new LoadableDetachableModel<Collection<Project>>() {+ add(new ProjectPicker("projectPicker", new LoadableDetachableModel<ProjectCollection>() {@Override- protected Collection<Project> load() {+ protected ProjectCollection load() {Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);List<Project> affinals = project.getForkRoot().getForkChildren();affinals.add(0, project.getForkRoot());+ ProjectCollection projects = OneDev.getInstance(ProjectManager.class)+ .getPermittedProjects(new ReadCode());for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {- if (!SecurityUtils.canReadCode(it.next()))+ if (!projects.getIds().contains(it.next().getId()))it.remove();}- return affinals;+ return new ProjectCollection(projects.getCache(),+ affinals.stream().map(it->it.getId()).collect(Collectors.toList()));}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex c3b2cd678e..383c45aa49 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -82,6 +82,7 @@ import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;import io.onedev.server.util.LinkSide;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.util.ProjectScope;import io.onedev.server.web.WebConstants;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;@@ -431,25 +432,19 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {+ return new ProjectSelector(id, new LoadableDetachableModel<ProjectCollection>() {@Override- protected Collection<Project> load() {- List<Project> projects = new ArrayList<>(OneDev.getInstance(ProjectManager.class)- .getPermittedProjects(new AccessProject()));+ protected ProjectCollection load() {+ ProjectCollection collection = OneDev.getInstance(ProjectManager.class)+ .getPermittedProjects(new AccessProject());- Predicate<Project> issueManagementEnabledPredicate = item -> item.isIssueManagement();- CollectionUtils.filter(projects, issueManagementEnabledPredicate);-- Collections.sort(projects, new Comparator<Project>() {-- @Override- public int compare(Project o1, Project o2) {- return o1.getPath().compareTo(o2.getPath());- }-- });- return projects;+ Predicate<Long> issueManagementPredicate =+ item -> collection.getCache().get(item).isIssueManagement();++ CollectionUtils.filter(collection.getIds(), issueManagementPredicate);+ collection.sortByPath();+ return collection;}}) {@@ -658,10 +653,10 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected Component newContent(String id, FloatingPanel dropdown2) {- return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {+ return new ProjectSelector(id, new LoadableDetachableModel<ProjectCollection>() {@Override- protected Collection<Project> load() {+ protected ProjectCollection load() {return getTargetProjects();}@@ -881,10 +876,10 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected Component newContent(String id, FloatingPanel dropdown2) {- return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {+ return new ProjectSelector(id, new LoadableDetachableModel<ProjectCollection>() {@Override- protected Collection<Project> load() {+ protected ProjectCollection load() {return getTargetProjects();}@@ -1016,22 +1011,14 @@ public abstract class IssueListPanel extends Panel {return menuItems;}- private Collection<Project> getTargetProjects() {- List<Project> projects = new ArrayList<>(OneDev.getInstance(ProjectManager.class)- .getPermittedProjects(new AccessProject()));-- Predicate<Project> issueManagementEnabledPredicate = item -> item.isIssueManagement();- CollectionUtils.filter(projects, issueManagementEnabledPredicate);- projects.remove(getProject());+ private ProjectCollection getTargetProjects() {+ ProjectCollection projects = OneDev.getInstance(ProjectManager.class).getPermittedProjects(new AccessProject());- Collections.sort(projects, new Comparator<Project>() {-- @Override- public int compare(Project o1, Project o2) {- return o1.getPath().compareTo(o2.getPath());- }-- });+ Predicate<Long> issueManagementPredicate =+ item -> projects.getCache().get(item).isIssueManagement();+ CollectionUtils.filter(projects.getIds(), issueManagementPredicate);+ projects.getIds().remove(getProject().getId());+ projects.sortByPath();return projects;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java b/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.javaindex c084915330..5a8bb5b875 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java@@ -1,7 +1,5 @@package io.onedev.server.web.component.project;-import java.util.Collection;-import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.model.IModel;@@ -9,6 +7,7 @@ import org.apache.wicket.model.Model;import org.unbescape.html.HtmlEscape;import io.onedev.server.model.Project;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.web.asset.icon.IconScope;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;@@ -18,9 +17,9 @@ import io.onedev.server.web.component.svg.SpriteImage;@SuppressWarnings("serial")public abstract class ProjectPicker extends DropdownLink {- private final IModel<Collection<Project>> projectsModel;+ private final IModel<ProjectCollection> projectsModel;- public ProjectPicker(String id, IModel<Collection<Project>> projectsModel) {+ public ProjectPicker(String id, IModel<ProjectCollection> projectsModel) {super(id);this.projectsModel = projectsModel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 4d8b13cf14..95f655659a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -78,6 +78,7 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.CreateChildren;import io.onedev.server.util.DateUtils;import io.onedev.server.util.ProjectBuildStats;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.util.ProjectIssueStats;import io.onedev.server.util.ProjectPullRequestStats;import io.onedev.server.util.facade.ProjectFacade;@@ -345,10 +346,10 @@ public class ProjectListPanel extends Panel {@Overrideprotected Component newContent(String id, FloatingPanel dropdown2) {- return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {+ return new ProjectSelector(id, new LoadableDetachableModel<ProjectCollection>() {@Override- protected Collection<Project> load() {+ protected ProjectCollection load() {return getTargetProjects();}@@ -604,10 +605,10 @@ public class ProjectListPanel extends Panel {@Overrideprotected Component newContent(String id, FloatingPanel dropdown2) {- return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {+ return new ProjectSelector(id, new LoadableDetachableModel<ProjectCollection>() {@Override- protected Collection<Project> load() {+ protected ProjectCollection load() {return getTargetProjects();}@@ -858,17 +859,9 @@ public class ProjectListPanel extends Panel {return menuItems;}- private Collection<Project> getTargetProjects() {- List<Project> projects = new ArrayList<>(getProjectManager().getPermittedProjects(new CreateChildren()));-- Collections.sort(projects, new Comparator<Project>() {-- @Override- public int compare(Project o1, Project o2) {- return o1.getPath().compareTo(o2.getPath());- }-- });+ private ProjectCollection getTargetProjects() {+ ProjectCollection projects = getProjectManager().getPermittedProjects(new CreateChildren());+ projects.sortByPath();return projects;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.javaindex 779632af5e..1e585f59c6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java@@ -1,6 +1,5 @@package io.onedev.server.web.component.project.selector;-import java.util.Collection;import java.util.List;import javax.annotation.Nullable;@@ -30,6 +29,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.util.match.MatchScoreProvider;import io.onedev.server.util.match.MatchScoreUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;@@ -41,13 +41,13 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;@SuppressWarnings("serial")public abstract class ProjectSelector extends Panel {- private final IModel<Collection<Project>> projectsModel;+ private final IModel<ProjectCollection> projectsModel;- private ListView<Project> projectsView;+ private ListView<Long> projectsView;private String searchInput;- public ProjectSelector(String id, IModel<Collection<Project>> projectsModel) {+ public ProjectSelector(String id, IModel<ProjectCollection> projectsModel) {super(id);this.projectsModel = projectsModel;@@ -114,33 +114,35 @@ public abstract class ProjectSelector extends Panel {});- projectsContainer.add(projectsView = new ListView<Project>("projects",- new LoadableDetachableModel<List<Project>>() {+ projectsContainer.add(projectsView = new ListView<Long>("projects",+ new LoadableDetachableModel<List<Long>>() {@Override- protected List<Project> load() {- MatchScoreProvider<Project> matchScoreProvider = new MatchScoreProvider<Project>() {+ protected List<Long> load() {+ MatchScoreProvider<Long> matchScoreProvider = new MatchScoreProvider<Long>() {@Override- public double getMatchScore(Project object) {- return MatchScoreUtils.getMatchScore(object.getPath(), searchInput);+ public double getMatchScore(Long object) {+ return MatchScoreUtils.getMatchScore(+ projectsModel.getObject().getCache().getPath(object), searchInput);}};- return MatchScoreUtils.filterAndSort(projectsModel.getObject(), matchScoreProvider);+ return MatchScoreUtils.filterAndSort(projectsModel.getObject().getIds(), matchScoreProvider);}}) {@Override- protected void populateItem(ListItem<Project> item) {- Project project = item.getModelObject();+ protected void populateItem(ListItem<Long> item) {+ Long projectId = item.getModelObject();AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {@Overridepublic void onClick(AjaxRequestTarget target) {- onSelect(target, item.getModelObject());+ Project project = OneDev.getInstance(ProjectManager.class).load(projectId);+ onSelect(target, project);}@Override@@ -152,15 +154,15 @@ public abstract class ProjectSelector extends Panel {}};- if (project.equals(getCurrent()))+ if (projectId.equals(Project.idOf(getCurrent())))link.add(AttributeAppender.append("class", " current"));- link.add(new ProjectAvatar("avatar", project.getId()));- link.add(new Label("path", project.getPath()));+ link.add(new ProjectAvatar("avatar", projectId));+ link.add(new Label("path", projectsModel.getObject().getCache().getPath(projectId)));item.add(link);if (item.getIndex() == 0)item.add(AttributeAppender.append("class", "active"));- item.add(AttributeAppender.append("data-id", project.getId()));+ item.add(AttributeAppender.append("data-id", projectId));}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex 763cc259b8..2d9e77cdef 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -2,8 +2,6 @@ package io.onedev.server.web.component.pullrequest.list;import java.util.ArrayList;import java.util.Collection;-import java.util.Collections;-import java.util.Comparator;import java.util.Iterator;import java.util.List;@@ -63,6 +61,7 @@ import io.onedev.server.search.entitytext.PullRequestTextManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ReadCode;import io.onedev.server.util.DateUtils;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.asset.emoji.Emojis;@@ -630,20 +629,13 @@ public abstract class PullRequestListPanel extends Panel {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {+ return new ProjectSelector(id, new LoadableDetachableModel<ProjectCollection>() {@Override- protected Collection<Project> load() {- List<Project> projects = new ArrayList<>(OneDev.getInstance(ProjectManager.class)- .getPermittedProjects(new ReadCode()));- Collections.sort(projects, new Comparator<Project>() {-- @Override- public int compare(Project o1, Project o2) {- return o1.getPath().compareTo(o2.getPath());- }-- });+ protected ProjectCollection load() {+ ProjectCollection projects = OneDev.getInstance(ProjectManager.class)+ .getPermittedProjects(new ReadCode());+ projects.sortByPath();return projects;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.javaindex 0e8a32934f..384abb826a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java@@ -1,8 +1,8 @@package io.onedev.server.web.component.revisionpicker;-import java.util.Collection;import java.util.Iterator;import java.util.List;+import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -14,7 +14,8 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ReadCode;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.web.component.project.ProjectPicker;@SuppressWarnings("serial")@@ -63,18 +64,22 @@ public abstract class AffinalRevisionPicker extends Panel {protected void onInitialize() {super.onInitialize();- add(new ProjectPicker("projectPicker", new LoadableDetachableModel<Collection<Project>>() {+ add(new ProjectPicker("projectPicker", new LoadableDetachableModel<ProjectCollection>() {@Override- protected Collection<Project> load() {+ protected ProjectCollection load() {Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);List<Project> affinals = project.getForkRoot().getForkChildren();affinals.add(0, project.getForkRoot());++ ProjectCollection projects = OneDev.getInstance(ProjectManager.class)+ .getPermittedProjects(new ReadCode());for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {- if (!SecurityUtils.canReadCode(it.next()))+ if (!projects.getIds().contains(it.next().getId()))it.remove();}- return affinals;+ return new ProjectCollection(projects.getCache(),+ affinals.stream().map(it->it.getId()).collect(Collectors.toList()));}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.javaindex 484fd87aeb..514ff15e39 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java@@ -13,6 +13,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.security.permission.CreateChildren;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.web.component.stringchoice.StringSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -33,9 +34,13 @@ public class ParentChoiceEditor extends PropertyEditor<String> {Map<String, String> projectPaths = new LinkedHashMap<>();Project currentProject = Project.get();- for (Project project: OneDev.getInstance(ProjectManager.class).getPermittedProjects(new CreateChildren())) {- if (currentProject == null || !currentProject.isSelfOrAncestorOf(project))- projectPaths.put(project.getPath(), project.getPath());+ ProjectCollection projects = OneDev.getInstance(ProjectManager.class)+ .getPermittedProjects(new CreateChildren());+ for (Long projectId: projects.getIds()) {+ if (currentProject == null || !projects.getCache().isSelfOrAncestorOf(currentProject.getId(), projectId)) {+ String projectPath = projects.getCache().getPath(projectId);+ projectPaths.put(projectPath, projectPath);+ }}String selection = getModelObject();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.cssindex d40f408344..b2350abc95 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css@@ -1,3 +1,7 @@+.CommitDetailPage>body>.main {+ min-width: 768px;+}+.commit-detail .list-group-item {padding: 1.25rem 1.5rem;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareCssResourceReference.javanew file mode 100644index 0000000000..5b9c5f32bd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project.compare;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class RevisionCompareCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public RevisionCompareCssResourceReference() {+ super(RevisionCompareCssResourceReference.class, "revision-compare.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 327d986987..2a684a3d31 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -57,7 +57,6 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.ProjectAndRevision;import io.onedev.server.util.diff.WhitespaceOption;-import io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference;import io.onedev.server.web.component.commit.list.CommitListPanel;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;@@ -553,6 +552,8 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);+ response.render(CssHeaderItem.forReference(+ new io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference()));response.render(CssHeaderItem.forReference(new RevisionCompareCssResourceReference()));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.cssnew file mode 100644index 0000000000..cc16ca1e4a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css@@ -0,0 +1,3 @@+.RevisionComparePage>body>.main {+ min-width: 768px;+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.cssindex 1dd0098cf0..6aaa6ed550 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css@@ -1,3 +1,6 @@+.PullRequestChangesPage>body>.main {+ min-width: 768px;+}.commits-selector ul a {text-decoration: none;display: block;diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex c70a3b72a8..d42443df84 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -47,6 +47,7 @@ import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;+import io.onedev.server.util.ProjectCollection;import io.onedev.server.util.interpolative.VariableInterpolator;import io.onedev.server.util.match.PatternApplied;import io.onedev.server.util.match.WildcardUtils;@@ -140,22 +141,22 @@ public class SuggestionUtils {public static List<InputSuggestion> suggestProjectPaths(String matchWith) {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- List<String> projectPaths = projectManager.getPermittedProjects(new AccessProject())- .stream()- .map(it->it.getPath())- .sorted()- .collect(Collectors.toList());+ ProjectCollection projects = projectManager.getPermittedProjects(new AccessProject());+ List<String> projectPaths = new ArrayList<>();+ for (Long projectId: projects.getIds())+ projectPaths.add(projects.getCache().getPath(projectId));+ Collections.sort(projectPaths);return suggest(projectPaths, matchWith);}public static List<InputSuggestion> suggestProjectNames(String matchWith) {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- List<String> projectNames = projectManager.getPermittedProjects(new AccessProject())- .stream()- .map(it->it.getName())- .sorted()- .collect(Collectors.toList());- return suggest(projectNames, matchWith);+ ProjectCollection projects = projectManager.getPermittedProjects(new AccessProject());+ List<String> projectPaths = new ArrayList<>();+ for (Long projectId: projects.getIds())+ projectPaths.add(projects.getCache().get(projectId).getName());+ Collections.sort(projectPaths);+ return suggest(projectPaths, matchWith);}public static List<InputSuggestion> suggestAgents(String matchWith) {@@ -364,12 +365,14 @@ public class SuggestionUtils {}} else {List<InputSuggestion> suggestions = new ArrayList<>();- for (Project each: projectManager.getPermittedProjects(new AccessProject())) {- LinearRange match = LinearRange.match(each.getPath() + scopeSeparator, matchWith);+ ProjectCollection projects = projectManager.getPermittedProjects(new AccessProject());+ for (Long projectId: projects.getIds()) {+ String projectPath = projects.getCache().getPath(projectId);+ LinearRange match = LinearRange.match(projectPath + scopeSeparator, matchWith);if (match != null) {suggestions.add(new InputSuggestion(- each.getPath() + scopeSeparator,- each.getPath().length() + scopeSeparator.length(),+ projectPath + scopeSeparator,+ projectPath.length() + scopeSeparator.length(),"select project first",match));if (suggestions.size() >= InputAssistBehavior.MAX_SUGGESTIONS)