The Unified and Autonomous Development Platform
Cache meta information for performance
robin shen712833503c2e
diff --git a/core/src/main/java/com/gitplex/server/CoreModule.java b/core/src/main/java/com/gitplex/server/CoreModule.javaindex c16d8ce76c..77b46d7974 100644--- a/core/src/main/java/com/gitplex/server/CoreModule.java+++ b/core/src/main/java/com/gitplex/server/CoreModule.java@@ -71,6 +71,7 @@ import com.gitplex.server.manager.ReviewInvitationManager;import com.gitplex.server.manager.ReviewManager;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.UserAuthorizationManager;+import com.gitplex.server.manager.UserInfoManager;import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.VisitInfoManager;import com.gitplex.server.manager.WorkExecutor;@@ -102,6 +103,7 @@ import com.gitplex.server.manager.impl.DefaultReviewInvitationManager;import com.gitplex.server.manager.impl.DefaultReviewManager;import com.gitplex.server.manager.impl.DefaultStorageManager;import com.gitplex.server.manager.impl.DefaultUserAuthorizationManager;+import com.gitplex.server.manager.impl.DefaultUserInfoManager;import com.gitplex.server.manager.impl.DefaultUserManager;import com.gitplex.server.manager.impl.DefaultVisitInfoManager;import com.gitplex.server.manager.impl.DefaultWorkExecutor;@@ -208,6 +210,7 @@ public class CoreModule extends AbstractPluginModule {bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);bind(VisitInfoManager.class).to(DefaultVisitInfoManager.class);+ bind(UserInfoManager.class).to(DefaultUserInfoManager.class);bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);bind(GroupManager.class).to(DefaultGroupManager.class);bind(MembershipManager.class).to(DefaultMembershipManager.class);diff --git a/core/src/main/java/com/gitplex/server/GitPlex.java b/core/src/main/java/com/gitplex/server/GitPlex.javaindex 42989e646f..0e32e42f73 100644--- a/core/src/main/java/com/gitplex/server/GitPlex.java+++ b/core/src/main/java/com/gitplex/server/GitPlex.java@@ -122,13 +122,10 @@ public class GitPlex extends AbstractPlugin implements Serializable {@Sessional@Overridepublic void postStart() {- initStage = null;-listenerRegistry.post(new SystemStarted());-ThreadContext.unbindSubject();-logger.info("Server is ready at " + configManager.getSystemSetting().getServerUrl() + ".");+ initStage = null;}public String guessServerUrl() {diff --git a/core/src/main/java/com/gitplex/server/event/project/ProjectRenamed.java b/core/src/main/java/com/gitplex/server/event/ProjectRenamed.javasimilarity index 89%rename from core/src/main/java/com/gitplex/server/event/project/ProjectRenamed.javarename to core/src/main/java/com/gitplex/server/event/ProjectRenamed.javaindex 39ff85498e..3f4defe0c2 100644--- a/core/src/main/java/com/gitplex/server/event/project/ProjectRenamed.java+++ b/core/src/main/java/com/gitplex/server/event/ProjectRenamed.java@@ -1,4 +1,4 @@-package com.gitplex.server.event.project;+package com.gitplex.server.event;import com.gitplex.server.model.Project;diff --git a/core/src/main/java/com/gitplex/server/event/project/ProjectDeleted.java b/core/src/main/java/com/gitplex/server/event/project/ProjectDeleted.javadeleted file mode 100644index 289a234de7..0000000000--- a/core/src/main/java/com/gitplex/server/event/project/ProjectDeleted.java+++ /dev/null@@ -1,17 +0,0 @@-package com.gitplex.server.event.project;--import com.gitplex.server.model.Project;--public class ProjectDeleted {-- private final Project project;-- public ProjectDeleted(Project project) {- this.project = project;- }-- public Project getProject() {- return project;- }--}diff --git a/core/src/main/java/com/gitplex/server/git/GitFilter.java b/core/src/main/java/com/gitplex/server/git/GitFilter.javaindex a4db8805c9..bb6bd5d1ee 100644--- a/core/src/main/java/com/gitplex/server/git/GitFilter.java+++ b/core/src/main/java/com/gitplex/server/git/GitFilter.java@@ -130,7 +130,7 @@ public class GitFilter implements Filter {environments.put("GITPLEX_URL", serverUrl);environments.put("GITPLEX_USER_ID", User.getCurrentId().toString());environments.put("GITPLEX_REPOSITORY_ID", project.getId().toString());- File gitDir = storageManager.getGitDir(project);+ File gitDir = storageManager.getProjectGitDir(project.getId());if (GitSmartHttpTools.isUploadPack(request)) {if (!SecurityUtils.canRead(project)) {@@ -191,7 +191,7 @@ public class GitFilter implements Filter {Project project = getProject(request, response, projectInfo);String service = request.getParameter("service");- File gitDir = storageManager.getGitDir(project);+ File gitDir = storageManager.getProjectGitDir(project.getId());if (service.contains("upload")) {if (!SecurityUtils.canRead(project)) {diff --git a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.javaindex 860c03cd49..6788c9ef85 100644--- a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java+++ b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java@@ -113,7 +113,8 @@ public class GitPreReceiveCallback extends HttpServlet {Preconditions.checkNotNull(user);if (refName.startsWith(PullRequest.REFS_PREFIX) || refName.startsWith(PullRequestUpdate.REFS_PREFIX)) {- if (!user.asSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.ADMIN))) {+ if (!user.asSubject().isPermitted(+ new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMIN))) {error(output, refName, "Only project administrators can update gitplex refs.");break;}diff --git a/core/src/main/java/com/gitplex/server/manager/CacheManager.java b/core/src/main/java/com/gitplex/server/manager/CacheManager.javaindex 9442cecc6c..7fc59f11bd 100644--- a/core/src/main/java/com/gitplex/server/manager/CacheManager.java+++ b/core/src/main/java/com/gitplex/server/manager/CacheManager.java@@ -1,5 +1,54 @@package com.gitplex.server.manager;+import java.util.Map;++import javax.annotation.Nullable;++import com.gitplex.server.util.facade.GroupAuthorizationFacade;+import com.gitplex.server.util.facade.GroupFacade;+import com.gitplex.server.util.facade.MembershipFacade;+import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.util.facade.UserAuthorizationFacade;+import com.gitplex.server.util.facade.UserFacade;+public interface CacheManager {+ Map<Long, ProjectFacade> getProjects();++ Map<Long, UserFacade> getUsers();++ Map<Long, GroupFacade> getGroups();++ Map<Long, MembershipFacade> getMemberships();++ Map<Long, UserAuthorizationFacade> getUserAuthorizations();++ Map<Long, GroupAuthorizationFacade> getGroupAuthorizations();++ @Nullable+ ProjectFacade getProject(Long id);++ @Nullable+ UserFacade getUser(Long id);++ @Nullable+ GroupFacade getGroup(Long id);++ @Nullable+ MembershipFacade getMembership(Long id);++ @Nullable+ UserAuthorizationFacade getUserAuthorization(Long id);++ @Nullable+ GroupAuthorizationFacade getGroupAuthorization(Long id);++ @Nullable+ Long getUserIdByName(String name);++ @Nullable+ Long getUserIdByEmail(String email);++ @Nullable+ Long getProjectIdByName(String name);}diff --git a/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.javaindex 3cd30bdc51..2ee1552214 100644--- a/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java@@ -2,21 +2,19 @@ package com.gitplex.server.manager;import java.util.List;import java.util.Set;-import java.util.concurrent.Future;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.server.git.NameAndEmail;-import com.gitplex.server.model.User;import com.gitplex.server.model.Project;+import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.util.facade.UserFacade;public interface CommitInfoManager {- Future<?> requestToCollect(Project project);-List<String> getFiles(Project project);- int getContributions(Project project, User user, String path);+ int getContributions(ProjectFacade project, UserFacade user, String path);int getCommitCount(Project project);@@ -52,4 +50,6 @@ public interface CommitInfoManager {void cloneInfo(Project from, Project to);+ ObjectId getLastCommit(Project project);+}diff --git a/core/src/main/java/com/gitplex/server/manager/ProjectManager.java b/core/src/main/java/com/gitplex/server/manager/ProjectManager.javaindex e3df2c6b3c..94d00152fe 100644--- a/core/src/main/java/com/gitplex/server/manager/ProjectManager.java+++ b/core/src/main/java/com/gitplex/server/manager/ProjectManager.java@@ -1,12 +1,9 @@package com.gitplex.server.manager;-import java.util.Collection;-import javax.annotation.Nullable;import org.eclipse.jgit.lib.Repository;-import com.gitplex.server.model.User;import com.gitplex.server.model.Project;import com.gitplex.server.persistence.dao.EntityManager;@@ -33,6 +30,4 @@ public interface ProjectManager extends EntityManager<Project> {Repository getRepository(Project project);- Collection<Project> findAllAccessible(@Nullable User user);-}diff --git a/core/src/main/java/com/gitplex/server/manager/StorageManager.java b/core/src/main/java/com/gitplex/server/manager/StorageManager.javaindex 50c334e7fd..7d5819cf9f 100644--- a/core/src/main/java/com/gitplex/server/manager/StorageManager.java+++ b/core/src/main/java/com/gitplex/server/manager/StorageManager.java@@ -2,8 +2,6 @@ package com.gitplex.server.manager;import java.io.File;-import com.gitplex.server.model.Project;-public interface StorageManager {/**@@ -12,7 +10,7 @@ public interface StorageManager {* @return* directory to store git repository, the directory will be exist after calling this method*/- File getGitDir(Project project);+ File getProjectGitDir(Long projectId);/*** Get directory to store Lucene index of specified project@@ -20,7 +18,7 @@ public interface StorageManager {* @return* directory to store lucene index, the directory will be exist after calling this method*/- File getIndexDir(Project project);+ File getProjectIndexDir(Long projectId);/*** Get directory to store additional info of specified project@@ -28,7 +26,7 @@ public interface StorageManager {* @return* directory to store additional info, the directory will be exist after calling this method*/- File getInfoDir(Project project);+ File getProjectInfoDir(Long projectId);/*** Get directory to store attachments of specified project@@ -36,6 +34,8 @@ public interface StorageManager {* @return* directory store attachments, the directory will be exist after calling this method*/- File getAttachmentDir(Project project);+ File getProjectAttachmentDir(Long projectId);++ File getUserInfoDir(Long userId);}diff --git a/core/src/main/java/com/gitplex/server/manager/UserInfoManager.java b/core/src/main/java/com/gitplex/server/manager/UserInfoManager.javanew file mode 100644index 0000000000..bb88fa008a--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/UserInfoManager.java@@ -0,0 +1,19 @@+package com.gitplex.server.manager;++import java.util.Date;++import javax.annotation.Nullable;++import com.gitplex.server.model.Project;+import com.gitplex.server.model.User;+import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.util.facade.UserFacade;++public interface UserInfoManager {++ void visit(User user, Project project);++ @Nullable+ Date getVisitDate(UserFacade user, ProjectFacade project);++}diff --git a/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.javaindex 394727af12..8b84047a9f 100644--- a/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/VisitInfoManager.java@@ -4,22 +4,16 @@ import java.util.Date;import javax.annotation.Nullable;-import com.gitplex.server.model.User;import com.gitplex.server.model.CodeComment;-import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.User;public interface VisitInfoManager {- void visit(User user, Project project);-void visit(User user, PullRequest request);void visit(User user, CodeComment comment);- @Nullable- Date getVisitDate(User user, Project project);-@NullableDate getVisitDate(User user, PullRequest request);diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.javaindex 01930ab893..aabdb6c1ea 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java@@ -60,11 +60,11 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTprivate File getPermanentAttachmentDir(Project project, String attachmentDirUUID) {String category = attachmentDirUUID.substring(0, 2);- return new File(storageManager.getAttachmentDir(project), "permanent/" + category + "/" + attachmentDirUUID);+ return new File(storageManager.getProjectAttachmentDir(project.getId()), "permanent/" + category + "/" + attachmentDirUUID);}private File getTempAttachmentDir(Project project) {- return new File(storageManager.getAttachmentDir(project), "temp");+ return new File(storageManager.getProjectAttachmentDir(project.getId()), "temp");}private File getTempAttachmentDir(Project project, String attachmentDirUUID) {@@ -149,7 +149,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTpublic void on(EntityRemoved event) {if (event.getEntity() instanceof Project) {Project project = (Project) event.getEntity();- FileUtils.deleteDir(storageManager.getAttachmentDir(project));+ FileUtils.deleteDir(storageManager.getProjectAttachmentDir(project.getId()));} else if (event.getEntity() instanceof CodeComment) {CodeComment comment = (CodeComment) event.getEntity();File permanentAttachmentDir = getPermanentAttachmentDir(comment.getRequest().getTargetProject(), comment.getUUID());diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.javaindex 5787995265..3f2f5b2b6e 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java@@ -2,30 +2,373 @@ package com.gitplex.server.manager.impl;import java.util.HashMap;import java.util.Map;+import java.util.concurrent.locks.ReadWriteLock;+import java.util.concurrent.locks.ReentrantReadWriteLock;+import javax.inject.Inject;import javax.inject.Singleton;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.gitplex.launcher.loader.Listen;+import com.gitplex.server.event.lifecycle.SystemStarted;import com.gitplex.server.manager.CacheManager;+import com.gitplex.server.model.Group;+import com.gitplex.server.model.GroupAuthorization;import com.gitplex.server.model.Membership;-import com.gitplex.server.util.facade.UserFacade;-import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.User;+import com.gitplex.server.model.UserAuthorization;+import com.gitplex.server.persistence.annotation.Sessional;+import com.gitplex.server.persistence.annotation.Transactional;+import com.gitplex.server.persistence.dao.Dao;+import com.gitplex.server.persistence.dao.EntityPersisted;+import com.gitplex.server.persistence.dao.EntityRemoved;import com.gitplex.server.util.facade.GroupAuthorizationFacade;import com.gitplex.server.util.facade.GroupFacade;import com.gitplex.server.util.facade.MembershipFacade;+import com.gitplex.server.util.facade.ProjectFacade;import com.gitplex.server.util.facade.UserAuthorizationFacade;+import com.gitplex.server.util.facade.UserFacade;+import com.google.common.collect.BiMap;+import com.google.common.collect.HashBiMap;@Singletonpublic class DefaultCacheManager implements CacheManager {+ private final Logger logger = LoggerFactory.getLogger(DefaultCacheManager.class);++ private final Dao dao;+private final Map<Long, UserFacade> users = new HashMap<>();+ private final BiMap<String, Long> userIdsByName = HashBiMap.create();++ private final BiMap<String, Long> userIdsByEmail = HashBiMap.create();++ private final ReadWriteLock usersLock = new ReentrantReadWriteLock();+private final Map<Long, ProjectFacade> projects = new HashMap<>();+ private final BiMap<String, Long> projectIdsByName = HashBiMap.create();++ private final ReadWriteLock projectsLock = new ReentrantReadWriteLock();+private final Map<Long, GroupFacade> groups = new HashMap<>();- private final Map<Long, MembershipFacade> groupMemberships = new HashMap<>();+ private final ReadWriteLock groupsLock = new ReentrantReadWriteLock();++ private final Map<Long, MembershipFacade> memberships = new HashMap<>();++ private final ReadWriteLock membershipsLock = new ReentrantReadWriteLock();private final Map<Long, GroupAuthorizationFacade> groupAuthorizations = new HashMap<>();+ private final ReadWriteLock groupAuthorizationsLock = new ReentrantReadWriteLock();+private final Map<Long, UserAuthorizationFacade> userAuthorizations = new HashMap<>();++ private final ReadWriteLock userAuthorizationsLock = new ReentrantReadWriteLock();++ @Inject+ public DefaultCacheManager(Dao dao) {+ this.dao = dao;+ }++ @Sessional+ @Listen+ public void on(SystemStarted event) {+ logger.info("Caching meta data...");+ for (Project project: dao.findAll(Project.class)) {+ projects.put(project.getId(), project.getFacade());+ projectIdsByName.inverse().put(project.getId(), project.getName());+ }+ for (User user: dao.findAll(User.class)) {+ users.put(user.getId(), user.getFacade());+ userIdsByName.inverse().put(user.getId(), user.getName());+ if (user.getEmail() != null)+ userIdsByEmail.inverse().put(user.getId(), user.getEmail());+ }+ for (Group group: dao.findAll(Group.class))+ groups.put(group.getId(), group.getFacade());+ for (Membership membership: dao.findAll(Membership.class))+ memberships.put(membership.getId(), membership.getFacade());+ for (GroupAuthorization groupAuthorization: dao.findAll(GroupAuthorization.class))+ groupAuthorizations.put(groupAuthorization.getId(), groupAuthorization.getFacade());+ for (UserAuthorization userAuthorization: dao.findAll(UserAuthorization.class))+ userAuthorizations.put(userAuthorization.getId(), userAuthorization.getFacade());+ }++ @Transactional+ @Listen+ public void on(EntityPersisted event) {+ dao.doAfterCommit(new Runnable() {++ @Override+ public void run() {+ if (event.getEntity() instanceof Project) {+ projectsLock.writeLock().lock();+ try {+ ProjectFacade project = ((Project) event.getEntity()).getFacade();+ projects.put(event.getEntity().getId(), project);+ projectIdsByName.inverse().put(project.getId(), project.getName());+ } finally {+ projectsLock.writeLock().unlock();+ }+ } else if (event.getEntity() instanceof User) {+ usersLock.writeLock().lock();+ try {+ UserFacade user = ((User) event.getEntity()).getFacade();+ users.put(event.getEntity().getId(), user);+ userIdsByName.inverse().put(user.getId(), user.getName());+ if (user.getEmail() != null)+ userIdsByEmail.inverse().put(user.getId(), user.getEmail());+ } finally {+ usersLock.writeLock().unlock();+ }+ } else if (event.getEntity() instanceof Group) {+ groupsLock.writeLock().lock();+ try {+ groups.put(event.getEntity().getId(), ((Group) event.getEntity()).getFacade());+ } finally {+ groupsLock.writeLock().unlock();+ }+ } else if (event.getEntity() instanceof Membership) {+ membershipsLock.writeLock().lock();+ try {+ memberships.put(event.getEntity().getId(), ((Membership) event.getEntity()).getFacade());+ } finally {+ membershipsLock.writeLock().unlock();+ }+ } else if (event.getEntity() instanceof UserAuthorization) {+ userAuthorizationsLock.writeLock().lock();+ try {+ userAuthorizations.put(event.getEntity().getId(),+ ((UserAuthorization) event.getEntity()).getFacade());+ } finally {+ userAuthorizationsLock.writeLock().unlock();+ }+ } else if (event.getEntity() instanceof GroupAuthorization) {+ groupAuthorizationsLock.writeLock().lock();+ try {+ groupAuthorizations.put(event.getEntity().getId(),+ ((GroupAuthorization) event.getEntity()).getFacade());+ } finally {+ groupAuthorizationsLock.writeLock().unlock();+ }+ }+ }++ });+ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ dao.doAfterCommit(new Runnable() {++ @Override+ public void run() {+ if (event.getEntity() instanceof Project) {+ projectsLock.writeLock().lock();+ try {+ projects.remove(event.getEntity().getId());+ projectIdsByName.inverse().remove(event.getEntity().getId());+ } finally {+ projectsLock.writeLock().unlock();+ }+ } else if (event.getEntity() instanceof User) {+ usersLock.writeLock().lock();+ try {+ users.remove(event.getEntity().getId());+ userIdsByName.inverse().remove(event.getEntity().getId());+ userIdsByEmail.inverse().remove(event.getEntity().getId());+ } finally {+ usersLock.writeLock().unlock();+ }+ } else if (event.getEntity() instanceof Group) {+ groupsLock.writeLock().lock();+ try {+ groups.remove(event.getEntity().getId());+ } finally {+ groupsLock.writeLock().unlock();+ }+ } else if (event.getEntity() instanceof Membership) {+ membershipsLock.writeLock().lock();+ try {+ memberships.remove(event.getEntity().getId());+ } finally {+ membershipsLock.writeLock().unlock();+ }+ } else if (event.getEntity() instanceof UserAuthorization) {+ userAuthorizationsLock.writeLock().lock();+ try {+ userAuthorizations.remove(event.getEntity().getId());+ } finally {+ userAuthorizationsLock.writeLock().unlock();+ }+ } else if (event.getEntity() instanceof GroupAuthorization) {+ groupAuthorizationsLock.writeLock().lock();+ try {+ groupAuthorizations.remove(event.getEntity().getId());+ } finally {+ groupAuthorizationsLock.writeLock().unlock();+ }+ }+ }++ });+ }++ @Override+ public Map<Long, ProjectFacade> getProjects() {+ projectsLock.readLock().lock();+ try {+ return new HashMap<>(projects);+ } finally {+ projectsLock.readLock().unlock();+ }+ }++ @Override+ public Map<Long, UserFacade> getUsers() {+ usersLock.readLock().lock();+ try {+ return new HashMap<>(users);+ } finally {+ usersLock.readLock().unlock();+ }+ }++ @Override+ public Map<Long, GroupFacade> getGroups() {+ groupsLock.readLock().lock();+ try {+ return new HashMap<>(groups);+ } finally {+ groupsLock.readLock().unlock();+ }+ }++ @Override+ public Map<Long, MembershipFacade> getMemberships() {+ membershipsLock.readLock().lock();+ try {+ return new HashMap<>(memberships);+ } finally {+ membershipsLock.readLock().unlock();+ }+ }++ @Override+ public Map<Long, UserAuthorizationFacade> getUserAuthorizations() {+ userAuthorizationsLock.readLock().lock();+ try {+ return new HashMap<>(userAuthorizations);+ } finally {+ userAuthorizationsLock.readLock().unlock();+ }+ }++ @Override+ public Map<Long, GroupAuthorizationFacade> getGroupAuthorizations() {+ groupAuthorizationsLock.readLock().lock();+ try {+ return new HashMap<>(groupAuthorizations);+ } finally {+ groupAuthorizationsLock.readLock().unlock();+ }+ }++ @Override+ public ProjectFacade getProject(Long id) {+ projectsLock.readLock().lock();+ try {+ return projects.get(id);+ } finally {+ projectsLock.readLock().unlock();+ }+ }++ @Override+ public UserFacade getUser(Long id) {+ usersLock.readLock().lock();+ try {+ return users.get(id);+ } finally {+ usersLock.readLock().unlock();+ }+ }++ @Override+ public Long getUserIdByName(String name) {+ usersLock.readLock().lock();+ try {+ return userIdsByName.get(name);+ } finally {+ usersLock.readLock().unlock();+ }+ }++ @Override+ public Long getUserIdByEmail(String email) {+ usersLock.readLock().lock();+ try {+ return userIdsByEmail.get(email);+ } finally {+ usersLock.readLock().unlock();+ }+ }++ @Override+ public Long getProjectIdByName(String name) {+ projectsLock.readLock().lock();+ try {+ return projectIdsByName.get(name);+ } finally {+ projectsLock.readLock().unlock();+ }+ }++ @Override+ public GroupFacade getGroup(Long id) {+ groupsLock.readLock().lock();+ try {+ return groups.get(id);+ } finally {+ groupsLock.readLock().unlock();+ }+ }++ @Override+ public MembershipFacade getMembership(Long id) {+ membershipsLock.readLock().lock();+ try {+ return memberships.get(id);+ } finally {+ membershipsLock.readLock().unlock();+ }+ }++ @Override+ public UserAuthorizationFacade getUserAuthorization(Long id) {+ userAuthorizationsLock.readLock().lock();+ try {+ return userAuthorizations.get(id);+ } finally {+ userAuthorizationsLock.readLock().unlock();+ }+ }++ @Override+ public GroupAuthorizationFacade getGroupAuthorization(Long id) {+ groupAuthorizationsLock.readLock().lock();+ try {+ return groupAuthorizations.get(id);+ } finally {+ groupAuthorizationsLock.readLock().unlock();+ }+ }+}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.javaindex 4a890a43c1..5adf6603a3 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java@@ -18,7 +18,6 @@ import java.util.Set;import java.util.Stack;import java.util.concurrent.Callable;import java.util.concurrent.ConcurrentHashMap;-import java.util.concurrent.Future;import javax.annotation.Nullable;import javax.inject.Inject;@@ -38,23 +37,25 @@ import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.Listen;import com.gitplex.server.event.RefUpdated;+import com.gitplex.server.event.lifecycle.SystemStarted;import com.gitplex.server.event.lifecycle.SystemStopping;-import com.gitplex.server.event.project.ProjectDeleted;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.NameAndEmail;import com.gitplex.server.manager.BatchWorkManager;import com.gitplex.server.manager.CommitInfoManager;import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.StorageManager;-import com.gitplex.server.manager.WorkExecutor;-import com.gitplex.server.model.User;import com.gitplex.server.model.Project;import com.gitplex.server.persistence.UnitOfWork;+import com.gitplex.server.persistence.annotation.Sessional;+import com.gitplex.server.persistence.dao.EntityRemoved;import com.gitplex.server.util.BatchWorker;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.StringUtils;+import com.gitplex.server.util.VersionUtils;import com.gitplex.server.util.concurrent.Prioritized;-import com.gitplex.server.util.concurrent.PrioritizedRunnable;+import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.util.facade.UserFacade;import com.google.common.base.Charsets;import jetbrains.exodus.ArrayByteIterable;@@ -74,6 +75,8 @@ import jetbrains.exodus.env.TransactionalExecutable;public class DefaultCommitInfoManager implements CommitInfoManager {private static final Logger logger = LoggerFactory.getLogger(DefaultCommitInfoManager.class);++ private static final int INFO_VERSION = 1;private static final String INFO_DIR = "commit";@@ -97,8 +100,6 @@ public class DefaultCommitInfoManager implements CommitInfoManager {private final StorageManager storageManager;- private final WorkExecutor workExecutor;-private final BatchWorkManager batchWorkManager;private final ProjectManager projectManager;@@ -117,18 +118,17 @@ public class DefaultCommitInfoManager implements CommitInfoManager {@Injectpublic DefaultCommitInfoManager(ProjectManager projectManager, StorageManager storageManager,- BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, WorkExecutor workExecutor) {+ BatchWorkManager batchWorkManager, UnitOfWork unitOfWork) {this.projectManager = projectManager;this.storageManager = storageManager;this.batchWorkManager = batchWorkManager;this.unitOfWork = unitOfWork;- this.workExecutor = workExecutor;}private void doCollect(Project project, List<RevCommit> commits) {logger.debug("Collecting commits info (project: {}, commits: {})...", project, commits.size());- Environment env = getEnv(project);+ Environment env = getEnv(project.getId());Store defaultStore = getStore(env, DEFAULT_STORE);Store commitsStore = getStore(env, COMMITS_STORE);Store contributionsStore = getStore(env, CONTRIBUTIONS_STORE);@@ -316,22 +316,22 @@ public class DefaultCommitInfoManager implements CommitInfoManager {new ArrayByteIterable(byteBuffer.array()));}- private Environment getEnv(final Project project) {+ private Environment getEnv(Long projectId) {synchronized (envs) {- Environment env = envs.get(project.getId());+ Environment env = envs.get(projectId);if (env == null) {EnvironmentConfig config = new EnvironmentConfig();config.setEnvCloseForcedly(true);config.setLogFileSize(64*1024);- env = Environments.newInstance(getInfoDir(project), config);- envs.put(project.getId(), env);+ env = Environments.newInstance(getInfoDir(projectId), config);+ envs.put(projectId, env);}return env;}}- private File getInfoDir(Project project) {- File infoDir = new File(storageManager.getInfoDir(project), INFO_DIR);+ private File getInfoDir(Long projectId) {+ File infoDir = new File(storageManager.getProjectInfoDir(projectId), INFO_DIR);if (!infoDir.exists())FileUtils.createDir(infoDir);return infoDir;@@ -350,7 +350,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {public List<NameAndEmail> getAuthors(Project project) {List<NameAndEmail> authors = authorsCache.get(project.getId());if (authors == null) {- Environment env = getEnv(project);+ Environment env = getEnv(project.getId());Store store = getStore(env, DEFAULT_STORE);authors = env.computeInReadonlyTransaction(new TransactionalComputable<List<NameAndEmail>>() {@@ -378,7 +378,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {public List<NameAndEmail> getCommitters(Project project) {List<NameAndEmail> committers = committersCache.get(project.getId());if (committers == null) {- Environment env = getEnv(project);+ Environment env = getEnv(project.getId());Store store = getStore(env, DEFAULT_STORE);committers = env.computeInReadonlyTransaction(new TransactionalComputable<List<NameAndEmail>>() {@@ -406,7 +406,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {public List<String> getFiles(Project project) {List<String> files = filesCache.get(project.getId());if (files == null) {- Environment env = getEnv(project);+ Environment env = getEnv(project.getId());final Store store = getStore(env, DEFAULT_STORE);files = env.computeInReadonlyTransaction(new TransactionalComputable<List<String>>() {@@ -434,9 +434,9 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}@Override- public int getContributions(Project project, User user, String path) {+ public int getContributions(ProjectFacade project, UserFacade user, String path) {if (user.getEmail() != null) {- Environment env = getEnv(project);+ Environment env = getEnv(project.getId());Store store = getStore(env, CONTRIBUTIONS_STORE);return env.computeInReadonlyTransaction(new TransactionalComputable<Integer>() {@@ -457,7 +457,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {@Overridepublic Set<ObjectId> getDescendants(Project project, final ObjectId ancestor) {- Environment env = getEnv(project);+ Environment env = getEnv(project.getId());final Store store = getStore(env, COMMITS_STORE);return env.computeInReadonlyTransaction(new TransactionalComputable<Set<ObjectId>>() {@@ -508,7 +508,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {@Overridepublic Set<ObjectId> getChildren(Project project, final ObjectId parent) {- Environment env = getEnv(project);+ Environment env = getEnv(project.getId());final Store store = getStore(env, COMMITS_STORE);return env.computeInReadonlyTransaction(new TransactionalComputable<Set<ObjectId>>() {@@ -542,16 +542,17 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}@Listen- public void on(ProjectDeleted event) {- Project project = event.getProject();- synchronized (envs) {- Environment env = envs.remove(project.getId());- if (env != null)- env.close();+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Project) {+ synchronized (envs) {+ Environment env = envs.remove(event.getEntity().getId());+ if (env != null)+ env.close();+ }+ filesCache.remove(event.getEntity().getId());+ commitCountCache.remove(event.getEntity().getId());+ authorsCache.remove(event.getEntity().getId());}- filesCache.remove(project.getId());- commitCountCache.remove(project.getId());- authorsCache.remove(project.getId());}private byte[] getBytes(@Nullable ByteIterable byteIterable) {@@ -589,49 +590,44 @@ public class DefaultCommitInfoManager implements CommitInfoManager {};}- @Override- public Future<?> requestToCollect(Project project) {- return workExecutor.submit(new PrioritizedRunnable(PRIORITY) {-- @Override- public void run() {- List<RevCommit> commits = new ArrayList<>();- try (RevWalk revWalk = new RevWalk(project.getRepository())) {- Collection<Ref> refs = new ArrayList<>();- refs.addAll(project.getRepository().getRefDatabase().getRefs(Constants.R_HEADS).values());- refs.addAll(project.getRepository().getRefDatabase().getRefs(Constants.R_TAGS).values());-- for (Ref ref: refs) {- RevObject revObj = revWalk.peel(revWalk.parseAny(ref.getObjectId()));- if (revObj instanceof RevCommit) {- RevCommit commit = (RevCommit) revObj;- Environment env = getEnv(project);- Store commitsStore = getStore(env, COMMITS_STORE);- boolean collected = env.computeInReadonlyTransaction(new TransactionalComputable<Boolean>() {-- @Override- public Boolean compute(Transaction txn) {- byte[] keyBytes = new byte[20];- commit.copyRawTo(keyBytes, 0);- ByteIterable key = new ArrayByteIterable(keyBytes);- byte[] valueBytes = getBytes(commitsStore.get(txn, key));- return valueBytes != null && valueBytes.length%2 != 0;- }-- });- if (!collected)- commits.add(commit);+ private void collect(Project project) {+ List<RevCommit> commits = new ArrayList<>();+ try (RevWalk revWalk = new RevWalk(project.getRepository())) {+ Collection<Ref> refs = new ArrayList<>();+ refs.addAll(project.getRepository().getRefDatabase().getRefs(Constants.R_HEADS).values());+ refs.addAll(project.getRepository().getRefDatabase().getRefs(Constants.R_TAGS).values());++ for (Ref ref: refs) {+ RevObject revObj = revWalk.peel(revWalk.parseAny(ref.getObjectId()));+ if (revObj instanceof RevCommit) {+ RevCommit commit = (RevCommit) revObj;+ Environment env = getEnv(project.getId());+ Store commitsStore = getStore(env, COMMITS_STORE);+ boolean collected = env.computeInReadonlyTransaction(new TransactionalComputable<Boolean>() {++ @Override+ public Boolean compute(Transaction txn) {+ byte[] keyBytes = new byte[20];+ commit.copyRawTo(keyBytes, 0);+ ByteIterable key = new ArrayByteIterable(keyBytes);+ byte[] valueBytes = getBytes(commitsStore.get(txn, key));+ return valueBytes != null && valueBytes.length%2 != 0;}- }- } catch (IOException e) {- throw new RuntimeException(e);++ });+ if (!collected)+ commits.add(commit);}-- if (!commits.isEmpty())- doCollect(project, commits);}-- });+ } catch (IOException e) {+ throw new RuntimeException(e);+ }++ commits.sort(Comparator.comparing(RevCommit::getCommitTime));+ for (RevCommit commit: commits) {+ CollectingWork work = new CollectingWork(PRIORITY, commit.getId());+ batchWorkManager.submit(getBatchWorker(project), work);+ }}@Listen@@ -642,13 +638,22 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}}+ @Sessional+ @Listen+ public void on(SystemStarted event) {+ for (Project project: projectManager.findAll()) {+ VersionUtils.checkInfoVersion(getInfoDir(project.getId()), INFO_VERSION);+ collect(project);+ }+ }+@Listenpublic void on(RefUpdated event) {if (!event.getNewObjectId().equals(ObjectId.zeroId())) {RevCommit commit = event.getProject().getRevCommit(event.getNewObjectId(), false);if (commit != null) {- CollectingWork refUpdate = new CollectingWork(PRIORITY, commit.getId());- batchWorkManager.submit(getBatchWorker(event.getProject()), refUpdate);+ CollectingWork work = new CollectingWork(PRIORITY, commit.getId());+ batchWorkManager.submit(getBatchWorker(event.getProject()), work);}}}@@ -657,7 +662,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {public int getCommitCount(Project project) {Integer commitCount = commitCountCache.get(project.getId());if (commitCount == null) {- Environment env = getEnv(project);+ Environment env = getEnv(project.getId());Store store = getStore(env, DEFAULT_STORE);commitCount = env.computeInReadonlyTransaction(new TransactionalComputable<Integer>() {@@ -699,20 +704,39 @@ public class DefaultCommitInfoManager implements CommitInfoManager {}@Override- public void cloneInfo(Project from, Project to) {- BackupStrategy backupStrategy = getEnv(from).getBackupStrategy();+ public void cloneInfo(Project source, Project target) {+ BackupStrategy backupStrategy = getEnv(source.getId()).getBackupStrategy();try {+ File targetDir = getInfoDir(target.getId());backupStrategy.beforeBackup();try {for (FileDescriptor descriptor: backupStrategy.listFiles()) {- FileUtils.copyFileToDirectory(descriptor.getFile(), getInfoDir(to));+ FileUtils.copyFileToDirectory(descriptor.getFile(), targetDir);}} finally {backupStrategy.afterBackup();}+ VersionUtils.writeInfoVersion(targetDir, INFO_VERSION);} catch (Exception e) {throw new RuntimeException(e);}}+ @Nullable+ @Override+ public ObjectId getLastCommit(Project project) {+ Environment env = getEnv(project.getId());+ Store defaultStore = getStore(env, DEFAULT_STORE);++ return env.computeInTransaction(new TransactionalComputable<ObjectId>() {++ @Override+ public ObjectId compute(Transaction txn) {+ byte[] bytes = getBytes(defaultStore.get(txn, LAST_COMMIT_KEY));+ return bytes != null? ObjectId.fromRaw(bytes): null;+ }++ });+ }+}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.javaindex 1a4d30dd99..60f15cc6d5 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java@@ -3,14 +3,9 @@ package com.gitplex.server.manager.impl;import java.io.File;import java.io.IOException;import java.io.InputStream;-import java.util.Collection;import java.util.Iterator;import java.util.Map;import java.util.concurrent.ConcurrentHashMap;-import java.util.concurrent.ExecutionException;-import java.util.concurrent.locks.ReadWriteLock;-import java.util.concurrent.locks.ReentrantReadWriteLock;-import java.util.stream.Collectors;import javax.inject.Inject;import javax.inject.Singleton;@@ -28,71 +23,56 @@ import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.Listen;import com.gitplex.launcher.loader.ListenerRegistry;+import com.gitplex.server.event.ProjectRenamed;import com.gitplex.server.event.RefUpdated;import com.gitplex.server.event.lifecycle.SystemStarted;-import com.gitplex.server.event.lifecycle.SystemStarting;import com.gitplex.server.event.lifecycle.SystemStopping;-import com.gitplex.server.event.project.ProjectDeleted;-import com.gitplex.server.event.project.ProjectRenamed;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.command.CloneCommand;+import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.CommitInfoManager;import com.gitplex.server.manager.ProjectManager;-import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.UserAuthorizationManager;-import com.gitplex.server.model.User;-import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.model.Project;-import com.gitplex.server.model.GroupAuthorization;-import com.gitplex.server.model.Membership;+import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.model.support.BranchProtection;import com.gitplex.server.model.support.TagProtection;-import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.security.permission.SystemAdministration;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.StringUtils;import com.google.common.base.Preconditions;import com.google.common.base.Throwables;-import com.google.common.collect.BiMap;-import com.google.common.collect.HashBiMap;@Singletonpublic class DefaultProjectManager extends AbstractEntityManager<Project> implements ProjectManager {private static final Logger logger = LoggerFactory.getLogger(DefaultProjectManager.class);- private static final int INFO_VERSION = 3;-private final ListenerRegistry listenerRegistry;private final CommitInfoManager commitInfoManager;- private final StorageManager storageManager;-private final UserAuthorizationManager userAuthorizationManager;+ private final CacheManager cacheManager;+private final String gitReceiveHook;- private final BiMap<String, Long> nameToId = HashBiMap.create();-- private final ReadWriteLock idLock = new ReentrantReadWriteLock();-private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();@Injectpublic DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager, ListenerRegistry listenerRegistry,- StorageManager storageManager, UserAuthorizationManager userAuthorizationManager) {+ UserAuthorizationManager userAuthorizationManager, CacheManager cacheManager) {super(dao);this.commitInfoManager = commitInfoManager;this.listenerRegistry = listenerRegistry;- this.storageManager = storageManager;this.userAuthorizationManager = userAuthorizationManager;+ this.cacheManager = cacheManager;try (InputStream is = getClass().getClassLoader().getResourceAsStream("git-receive-hook")) {Preconditions.checkNotNull(is);@@ -135,6 +115,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemboolean isNew = project.isNew();dao.persist(project);+if (isNew && !SecurityUtils.isAdministrator()) {UserAuthorization authorization = new UserAuthorization();authorization.setPrivilege(ProjectPrivilege.ADMIN);@@ -147,21 +128,14 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemlistenerRegistry.post(new ProjectRenamed(project, oldName));}- doAfterCommit(new Runnable() {+ dao.doAfterCommit(new Runnable() {@Overridepublic void run() {- idLock.writeLock().lock();- try {- nameToId.inverse().put(project.getId(), project.getName());- } finally {- idLock.writeLock().unlock();- }- if (isNew)- checkDirectory(project);+ checkGit(project);}-- });++ });}@Transactional@@ -172,39 +146,15 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemquery.executeUpdate();dao.remove(project);-- doAfterCommit(new Runnable() {-- @Override- public void run() {- idLock.writeLock().lock();- try {- nameToId.inverse().remove(project.getId());- } finally {- idLock.writeLock().unlock();- }- getRepository(project).close();- repositoryCache.remove(project.getId());- }-- });-- listenerRegistry.post(new ProjectDeleted(project));}- @Sessional@Overridepublic Project find(String projectName) {- idLock.readLock().lock();- try {- Long id = nameToId.get(projectName);- if (id != null)- return load(id);- else- return null;- } finally {- idLock.readLock().unlock();- }+ Long id = cacheManager.getProjectIdByName(projectName);+ if (id != null)+ return load(id);+ else+ return null;}@Transactional@@ -224,8 +174,8 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem});}- private boolean isGitHookValid(Project project, String hookName) {- File hookFile = new File(project.getGitDir(), "hooks/" + hookName);+ private boolean isGitHookValid(File gitDir, String hookName) {+ File hookFile = new File(gitDir, "hooks/" + hookName);if (!hookFile.exists())return false;@@ -243,24 +193,26 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemreturn true;}- private void checkDirectory(Project project) {+ private void checkGit(Project project) {File gitDir = project.getGitDir();- if (project.getGitDir().exists() && !GitUtils.isValid(gitDir)) {- logger.warn("Directory '" + gitDir + "' is not a valid git repository, removing...");- FileUtils.deleteDir(gitDir);- }-- if (!gitDir.exists()) {- logger.warn("Initializing git repository in '" + gitDir + "'...");- FileUtils.createDir(gitDir);+ if (gitDir.listFiles().length == 0) {+ logger.info("Initializing git repository in '" + gitDir + "'...");try {Git.init().setDirectory(gitDir).setBare(true).call();} catch (Exception e) {Throwables.propagate(e);}- }-- if (!isGitHookValid(project, "pre-receive") || !isGitHookValid(project, "post-receive")) {+ } else if (!GitUtils.isValid(gitDir)) {+ logger.warn("Directory '" + gitDir + "' is not a valid git repository, reinitializing...");+ FileUtils.cleanDir(gitDir);+ try {+ Git.init().setDirectory(gitDir).setBare(true).call();+ } catch (Exception e) {+ Throwables.propagate(e);+ }+ }++ if (!isGitHookValid(gitDir, "pre-receive") || !isGitHookValid(gitDir, "post-receive")) {File hooksDir = new File(gitDir, "hooks");File gitPreReceiveHookFile = new File(hooksDir, "pre-receive");@@ -271,44 +223,6 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemFileUtils.writeFile(gitPostReceiveHookFile, String.format(gitReceiveHook, "git-postreceive-callback"));gitPostReceiveHookFile.setExecutable(true);}-- File infoVersionFile = new File(storageManager.getInfoDir(project), "version.txt");- int infoVersion;- if (infoVersionFile.exists()) {- try {- infoVersion = Integer.parseInt(FileUtils.readFileToString(infoVersionFile).trim());- } catch (IOException e) {- throw new RuntimeException(e);- }- } else {- infoVersion = 0;- }- if (infoVersion != INFO_VERSION) {- FileUtils.cleanDir(infoVersionFile.getParentFile());- FileUtils.writeFile(infoVersionFile, String.valueOf(INFO_VERSION));- }- }-- @Sessional- @Listen- public void on(SystemStarting event) {- for (Project project: findAll())- nameToId.inverse().put(project.getId(), project.getName());- }-- @Transactional- @Listen- public void on(SystemStarted event) {- for (Project project: findAll()) {- logger.info("Checking project {}...", project.getName());- checkDirectory(project);- try {- commitInfoManager.requestToCollect(project).get();- } catch (InterruptedException | ExecutionException e) {- throw new RuntimeException(e);- }- logger.info("Project checking finished for {}", project.getName());- }}@Listen@@ -320,6 +234,12 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem}}+ @Listen+ public void on(SystemStarted event) {+ for (Project project: findAll())+ checkGit(project);+ }+@Transactional@Listenpublic void on(RefUpdated event) {@@ -342,27 +262,4 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem}}- @Sessional- @Override- public Collection<Project> findAllAccessible(User user) {- if (user == null) {- return findAll().stream().filter((project)->project.isPublicRead()).collect(Collectors.toSet());- } else if (user.asSubject().isPermitted(new SystemAdministration())) {- return findAll();- } else {- Collection<Project> authorizedProjects = user.getAuthorizedProjects();- for (Membership membership: user.getMemberships()) {- for (GroupAuthorization authorization: membership.getGroup().getAuthorizations())- authorizedProjects.add(authorization.getProject());- }-- for (Project project: findAll()) {- if (project.isPublicRead())- authorizedProjects.add(project);- }-- return authorizedProjects;- }- }-}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.javaindex 38282f94c6..160fadfcc6 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java@@ -43,36 +43,36 @@ import com.gitplex.launcher.loader.Listen;import com.gitplex.launcher.loader.ListenerRegistry;import com.gitplex.server.GitPlex;import com.gitplex.server.event.RefUpdated;-import com.gitplex.server.event.project.ProjectDeleted;import com.gitplex.server.event.pullrequest.MergePreviewCalculated;import com.gitplex.server.event.pullrequest.PullRequestOpened;import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;import com.gitplex.server.git.GitUtils;-import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.BatchWorkManager;import com.gitplex.server.manager.MarkdownManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.PullRequestStatusChangeManager;import com.gitplex.server.manager.PullRequestUpdateManager;import com.gitplex.server.manager.ReviewInvitationManager;-import com.gitplex.server.model.User;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.Review;import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.model.PullRequestStatusChange.Type;import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.Review;import com.gitplex.server.model.ReviewInvitation;+import com.gitplex.server.model.User;import com.gitplex.server.model.support.CloseInfo;-import com.gitplex.server.model.support.ProjectAndBranch;import com.gitplex.server.model.support.MergePreview;import com.gitplex.server.model.support.MergeStrategy;+import com.gitplex.server.model.support.ProjectAndBranch;import com.gitplex.server.persistence.UnitOfWork;import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.persistence.dao.EntityRemoved;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.BatchWorker;import com.gitplex.server.util.ReviewStatus;@@ -542,16 +542,19 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Transactional@Listen- public void on(ProjectDeleted event) {- for (PullRequest request: event.getProject().getOutgoingRequests()) {- if (!request.getTargetProject().equals(event.getProject()) && request.isOpen())- discard(request, "Source project is deleted.");- }-- Query query = getSession().createQuery("update PullRequest set sourceProject=null where "- + "sourceProject=:project");- query.setParameter("project", event.getProject());- query.executeUpdate();+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Project) {+ Project project = (Project) event.getEntity();+ for (PullRequest request: project.getOutgoingRequests()) {+ if (!request.getTargetProject().equals(project) && request.isOpen())+ discard(request, "Source project is deleted.");+ }++ Query query = getSession().createQuery("update PullRequest set sourceProject=null where "+ + "sourceProject=:project");+ query.setParameter("project", project);+ query.executeUpdate();+ }}@Transactionaldiff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.javaindex 60afb3c8a6..d820db4d60 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java@@ -17,6 +17,7 @@ import javax.inject.Inject;import javax.inject.Singleton;import org.apache.commons.lang3.StringUtils;+import org.apache.shiro.authz.Permission;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.treewalk.TreeWalk;@@ -27,20 +28,20 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.UserManager;import com.gitplex.server.manager.CommitInfoManager;import com.gitplex.server.manager.PullRequestManager;-import com.gitplex.server.manager.ReviewManager;import com.gitplex.server.manager.PullRequestStatusChangeManager;-import com.gitplex.server.model.User;+import com.gitplex.server.manager.ReviewManager;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.Group;import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.Review;import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.model.PullRequestStatusChange.Type;import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.Review;import com.gitplex.server.model.ReviewInvitation;-import com.gitplex.server.model.Group;+import com.gitplex.server.model.User;import com.gitplex.server.model.support.BranchProtection;import com.gitplex.server.model.support.FileProtection;import com.gitplex.server.persistence.annotation.Sessional;@@ -52,6 +53,8 @@ import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.permission.ProjectPermission;import com.gitplex.server.util.ReviewStatus;+import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.util.reviewappointment.ReviewAppointment;@Singleton@@ -207,25 +210,37 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>}@Nullable- private ReviewInvitation getInvitation(User user) {+ private ReviewInvitation getInvitation(Long userId) {for (ReviewInvitation invitation: request.getReviewInvitations()) {- if (invitation.getUser().equals(user))+ if (invitation.getUser().getId().equals(userId))return invitation;}return null;}+ @Nullable+ private Review getReviewAfter(Long userId, PullRequestUpdate update) {+ for (Review review: update.getRequest().getReviews()) {+ if (review.getUser().getId().equals(userId) && review.getUpdate() != null+ && review.getUpdate().getId()>=update.getId()) {+ return review;+ }+ }+ return null;+ }+public ReviewStatusImpl(PullRequest request) {this.request = request;for (ReviewInvitation invitation: request.getReviewInvitations()) {if (!invitation.getUser().equals(request.getSubmitter())&& invitation.getType() == ReviewInvitation.Type.MANUAL) {- Review effectiveReview = invitation.getUser().getReviewAfter(request.getLatestUpdate());+ UserFacade user = invitation.getUser().getFacade();+ Review effectiveReview = getReviewAfter(user.getId(), request.getLatestUpdate());if (effectiveReview == null)awaitingReviewers.add(invitation.getUser());else- effectiveReviews.put(effectiveReview.getUser(), effectiveReview);+ effectiveReviews.put(invitation.getUser(), effectiveReview);}}@@ -250,10 +265,10 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>}}- if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(- new ProjectPermission(request.getTargetProject(), ProjectPrivilege.WRITE))) {- Collection<User> writers = SecurityUtils.findUsersCan(request.getTargetProject(),- ProjectPrivilege.WRITE);+ ProjectFacade project = request.getTargetProject().getFacade();+ Permission writePermission = new ProjectPermission(project, ProjectPrivilege.WRITE);+ if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writePermission)) {+ Collection<UserFacade> writers = SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.WRITE);checkReviews(writers, 1, request.getLatestUpdate(), true);}@@ -271,15 +286,23 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>}+ private boolean isAwaitingReviewer(Long userId) {+ for (User user: awaitingReviewers) {+ if (user.getId().equals(userId))+ return true;+ }+ return false;+ }+private void checkReviews(ReviewAppointment appointment, PullRequestUpdate update) {for (User user: appointment.getUsers()) {- if (!user.equals(request.getSubmitter()) && !awaitingReviewers.contains(user)) {- Review effectiveReview = user.getReviewAfter(update);+ if (!user.equals(request.getSubmitter()) && !isAwaitingReviewer(user.getId())) {+ Review effectiveReview = getReviewAfter(user.getId(), update);if (effectiveReview == null) {awaitingReviewers.add(user);- inviteReviewer(user);+ inviteReviewer(user.getId());} else {- effectiveReviews.put(effectiveReview.getUser(), effectiveReview);+ effectiveReviews.put(user, effectiveReview);}}}@@ -287,24 +310,31 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>for (Map.Entry<Group, Integer> entry: appointment.getGroups().entrySet()) {Group group = entry.getKey();int requiredCount = entry.getValue();- checkReviews(group.getMembers(), requiredCount, update, false);+ checkReviews(getFacades(group.getMembers()), requiredCount, update, false);}}- private void checkReviews(Collection<User> users, int requiredCount, PullRequestUpdate update,+ private Collection<UserFacade> getFacades(Collection<User> users) {+ Collection<UserFacade> facades = new HashSet<>();+ for (User user: users)+ facades.add(user.getFacade());+ return facades;+ }++ private void checkReviews(Collection<UserFacade> users, int requiredCount, PullRequestUpdate update,boolean excludeAutoReviews) {if (requiredCount == 0)requiredCount = users.size();int effectiveCount = 0;- Set<User> potentialReviewers = new HashSet<>();- for (User user: users) {- if (user.equals(request.getSubmitter())) {+ Set<UserFacade> potentialReviewers = new HashSet<>();+ for (UserFacade user: users) {+ if (user.getId().equals(request.getSubmitter().getId())) {effectiveCount++;- } else if (awaitingReviewers.contains(user)) {+ } else if (isAwaitingReviewer(user.getId())) {requiredCount--;} else {- Review effectiveReview = user.getReviewAfter(update);+ Review effectiveReview = getReviewAfter(user.getId(), update);if (effectiveReview != null) {if (!excludeAutoReviews || !effectiveReview.isAutoCheck()) {effectiveCount++;@@ -321,17 +351,17 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>}int missingCount = requiredCount - effectiveCount;- Set<User> reviewers = new HashSet<>();+ Set<UserFacade> reviewers = new HashSet<>();- List<User> candidateReviewers = new ArrayList<>();- for (User user: potentialReviewers) {- ReviewInvitation invitation = getInvitation(user);+ List<UserFacade> candidateReviewers = new ArrayList<>();+ for (UserFacade user: potentialReviewers) {+ ReviewInvitation invitation = getInvitation(user.getId());if (invitation != null && invitation.getType() != ReviewInvitation.Type.EXCLUDE)candidateReviewers.add(user);}sortByContributions(candidateReviewers, update);- for (User user: candidateReviewers) {+ for (UserFacade user: candidateReviewers) {reviewers.add(user);if (reviewers.size() == missingCount)break;@@ -339,13 +369,13 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>if (reviewers.size() < missingCount) {candidateReviewers = new ArrayList<>();- for (User user: potentialReviewers) {- ReviewInvitation invitation = getInvitation(user);+ for (UserFacade user: potentialReviewers) {+ ReviewInvitation invitation = getInvitation(user.getId());if (invitation == null)candidateReviewers.add(user);}sortByContributions(candidateReviewers, update);- for (User user: candidateReviewers) {+ for (UserFacade user: candidateReviewers) {reviewers.add(user);if (reviewers.size() == missingCount)break;@@ -353,15 +383,15 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>}if (reviewers.size() < missingCount) {List<ReviewInvitation> excludedInvitations = new ArrayList<>();- for (User user: potentialReviewers) {- ReviewInvitation invitation = getInvitation(user);+ for (UserFacade user: potentialReviewers) {+ ReviewInvitation invitation = getInvitation(user.getId());if (invitation != null && invitation.getType() == ReviewInvitation.Type.EXCLUDE)excludedInvitations.add(invitation);}excludedInvitations.sort(Comparator.comparing(ReviewInvitation::getDate));for (ReviewInvitation invitation: excludedInvitations) {- reviewers.add(invitation.getUser());+ reviewers.add(invitation.getUser().getFacade());if (reviewers.size() == missingCount)break;}@@ -373,16 +403,17 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>throw new RuntimeException(errorMessage);}- for (User user: reviewers) {- awaitingReviewers.add(user);- inviteReviewer(user);+ UserManager userManager = GitPlex.getInstance(UserManager.class);+ for (UserFacade user: reviewers) {+ awaitingReviewers.add(userManager.load(user.getId()));+ inviteReviewer(user.getId());}}- private void sortByContributions(List<User> users, PullRequestUpdate update) {+ private void sortByContributions(List<UserFacade> users, PullRequestUpdate update) {CommitInfoManager commitInfoManager = GitPlex.getInstance(CommitInfoManager.class);- Map<User, Integer> contributions = new HashMap<>();- for (User user: users)+ Map<UserFacade, Integer> contributions = new HashMap<>();+ for (UserFacade user: users)contributions.put(user, 0);int count = 0;@@ -404,27 +435,27 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>users.sort((user1, user2)-> contributions.get(user2) - contributions.get(user1));}- private int addContributions(Map<User, Integer> contributions, CommitInfoManager commitInfoManager,+ private int addContributions(Map<UserFacade, Integer> contributions, CommitInfoManager commitInfoManager,String file, PullRequestUpdate update) {int addedContributions = 0;- for (Map.Entry<User, Integer> entry: contributions.entrySet()) {- User user = entry.getKey();- int fileContribution = commitInfoManager.getContributions(update.getRequest().getTargetProject(), user,- file);+ for (Map.Entry<UserFacade, Integer> entry: contributions.entrySet()) {+ UserFacade user = entry.getKey();+ int fileContribution = commitInfoManager.getContributions(+ update.getRequest().getTargetProject().getFacade(), user, file);entry.setValue(entry.getValue() + fileContribution);addedContributions += fileContribution;}return addedContributions;}- private void inviteReviewer(User user) {- ReviewInvitation invitation = getInvitation(user);+ private void inviteReviewer(Long userId) {+ ReviewInvitation invitation = getInvitation(userId);if (invitation != null) {invitation.setType(ReviewInvitation.Type.RULE);} else {invitation = new ReviewInvitation();invitation.setRequest(request);- invitation.setUser(user);+ invitation.setUser(GitPlex.getInstance(UserManager.class).load(userId));invitation.setType(ReviewInvitation.Type.RULE);request.getReviewInvitations().add(invitation);}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.javaindex 8b9e6c797e..7cadc189a4 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java@@ -11,12 +11,13 @@ import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.Listen;import com.gitplex.server.event.lifecycle.SystemStarting;-import com.gitplex.server.event.project.ProjectDeleted;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.model.Project;+import com.gitplex.server.model.User;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.Dao;+import com.gitplex.server.persistence.dao.EntityRemoved;import com.gitplex.server.util.FileUtils;@Singleton@@ -48,36 +49,36 @@ public class DefaultStorageManager implements StorageManager {return projectsDir;}- private File getProjectDir(Project project) {- File projectDir = new File(getProjectsDir(), String.valueOf(project.getId()));+ private File getProjectDir(Long projectId) {+ File projectDir = new File(getProjectsDir(), String.valueOf(projectId));FileUtils.createDir(projectDir);return projectDir;}@Override- public File getGitDir(Project project) {- File gitDir = new File(getProjectDir(project), "git");+ public File getProjectGitDir(Long projectId) {+ File gitDir = new File(getProjectDir(projectId), "git");FileUtils.createDir(gitDir);return gitDir;}@Override- public File getInfoDir(Project project) {- File cacheDir = new File(getProjectDir(project), "info");- FileUtils.createDir(cacheDir);- return cacheDir;+ public File getProjectInfoDir(Long projectId) {+ File infoDir = new File(getProjectDir(projectId), "info");+ FileUtils.createDir(infoDir);+ return infoDir;}@Override- public File getIndexDir(Project project) {- File indexDir = new File(getProjectDir(project), "index");+ public File getProjectIndexDir(Long projectId) {+ File indexDir = new File(getProjectDir(projectId), "index");FileUtils.createDir(indexDir);return indexDir;}@Override- public File getAttachmentDir(Project project) {- File attachmentDir = new File(getProjectDir(project), "attachment");+ public File getProjectAttachmentDir(Long projectId) {+ File attachmentDir = new File(getProjectDir(projectId), "attachment");FileUtils.createDir(attachmentDir);return attachmentDir;}@@ -90,17 +91,27 @@ public class DefaultStorageManager implements StorageManager {FileUtils.deleteDir(projectDir);}}+ for (File userDir: getUsersDir().listFiles()) {+ if (new File(userDir, DELETE_MARK).exists()) {+ logger.info("Deleting directory marked for deletion: " + userDir);+ FileUtils.deleteDir(userDir);+ }+ }}@Transactional@Listen- public void on(ProjectDeleted event) {+ public void on(EntityRemoved event) {dao.doAfterCommit(new Runnable() {@Overridepublic void run() {try {- new File(getProjectDir(event.getProject()), DELETE_MARK).createNewFile();+ if (event.getEntity() instanceof Project) {+ new File(getProjectDir(event.getEntity().getId()), DELETE_MARK).createNewFile();+ } else if (event.getEntity() instanceof User) {+ new File(getUserInfoDir(event.getEntity().getId()), DELETE_MARK).createNewFile();+ }} catch (IOException e) {throw new RuntimeException(e);}@@ -108,5 +119,18 @@ public class DefaultStorageManager implements StorageManager {});}-++ private File getUsersDir() {+ File usersDir = new File(getStorageDir(), "users");+ FileUtils.createDir(usersDir);+ return usersDir;+ }++ @Override+ public File getUserInfoDir(Long userId) {+ File userDir = new File(getUsersDir(), String.valueOf(userId));+ FileUtils.createDir(userDir);+ return userDir;+ }+}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserInfoManager.javanew file mode 100644index 0000000000..4db41f8545--- /dev/null+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserInfoManager.java@@ -0,0 +1,174 @@+package com.gitplex.server.manager.impl;++import java.io.File;+import java.nio.ByteBuffer;+import java.util.Arrays;+import java.util.Date;+import java.util.HashMap;+import java.util.Map;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;++import com.gitplex.launcher.loader.Listen;+import com.gitplex.server.event.lifecycle.SystemStopping;+import com.gitplex.server.manager.StorageManager;+import com.gitplex.server.manager.UserInfoManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.User;+import com.gitplex.server.persistence.annotation.Transactional;+import com.gitplex.server.persistence.dao.Dao;+import com.gitplex.server.persistence.dao.EntityRemoved;+import com.gitplex.server.util.VersionUtils;+import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.util.facade.UserFacade;++import jetbrains.exodus.ArrayByteIterable;+import jetbrains.exodus.ByteIterable;+import jetbrains.exodus.env.Environment;+import jetbrains.exodus.env.EnvironmentConfig;+import jetbrains.exodus.env.Environments;+import jetbrains.exodus.env.Store;+import jetbrains.exodus.env.StoreConfig;+import jetbrains.exodus.env.Transaction;+import jetbrains.exodus.env.TransactionalComputable;+import jetbrains.exodus.env.TransactionalExecutable;++/**+ * Store project visit information here as we only need to load a single database to sort projects based on user+ * visit information+ *+ * @author robin+ *+ */+@Singleton+public class DefaultUserInfoManager implements UserInfoManager {++ private static final int INFO_VERSION = 1;++ private static final String VISIT_STORE = "visit";++ private final Map<Long, Environment> envs = new HashMap<>();++ private final StorageManager storageManager;++ private final Dao dao;++ @Inject+ public DefaultUserInfoManager(Dao dao, StorageManager storageManager) {+ this.dao = dao;+ this.storageManager = storageManager;+ }++ private synchronized Environment getEnv(Long userId) {+ Environment env = envs.get(userId);+ if (env == null) {+ EnvironmentConfig config = new EnvironmentConfig();+ config.setEnvCloseForcedly(true);++ File infoDir = storageManager.getUserInfoDir(userId);+ VersionUtils.checkInfoVersion(infoDir, INFO_VERSION);+ env = Environments.newInstance(infoDir, config);+ envs.put(userId, env);+ }+ return env;+ }++ private Store getStore(Environment env, String storeName) {+ return env.computeInTransaction(new TransactionalComputable<Store>() {+ @Override+ public Store compute(Transaction txn) {+ return env.openStore(storeName, StoreConfig.WITHOUT_DUPLICATES, txn);+ }+ });+ }++ private byte[] getBytes(@Nullable ByteIterable byteIterable) {+ if (byteIterable != null)+ return Arrays.copyOf(byteIterable.getBytesUnsafe(), byteIterable.getLength());+ else+ return null;+ }++ @Override+ public void visit(User user, Project project) {+ Environment env = getEnv(user.getId());+ Store store = getStore(env, VISIT_STORE);+ env.executeInTransaction(new TransactionalExecutable() {++ @Override+ public void execute(Transaction txn) {+ store.put(txn, new StringByteIterable(project.getUUID()),+ new ArrayByteIterable(longToBytes(System.currentTimeMillis()+1000L)));+ }++ });+ }++ @Override+ public Date getVisitDate(UserFacade user, ProjectFacade project) {+ Environment env = getEnv(user.getId());+ Store store = getStore(env, VISIT_STORE);+ return env.computeInTransaction(new TransactionalComputable<Date>() {++ @Override+ public Date compute(Transaction txn) {+ byte[] bytes = getBytes(store.get(txn, new StringByteIterable(project.getUUID())));+ if (bytes != null)+ return new Date(bytesToLong(bytes));+ else+ return null;+ }++ });+ }++ private byte[] longToBytes(long value) {+ ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);+ buffer.putLong(value);+ return buffer.array();+ }++ private long bytesToLong(byte[] bytes) {+ ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);+ buffer.put(bytes);+ buffer.flip();+ return buffer.getLong();+ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Project) {+ Long projectId = event.getEntity().getId();+ dao.doAfterCommit(new Runnable() {++ @Override+ public void run() {+ synchronized (envs) {+ Environment env = envs.remove(projectId);+ if (env != null)+ env.close();+ }+ }++ });+ }+ }++ @Listen+ public void on(SystemStopping event) {+ synchronized (envs) {+ for (Environment env: envs.values())+ env.close();+ }+ }++ static class StringByteIterable extends ArrayByteIterable {+ StringByteIterable(String value) {+ super(value.getBytes());+ }+ }++}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.javaindex 796d415c3a..af49d8ae56 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java@@ -1,8 +1,5 @@package com.gitplex.server.manager.impl;-import java.util.concurrent.locks.ReadWriteLock;-import java.util.concurrent.locks.ReentrantReadWriteLock;-import javax.inject.Inject;import javax.inject.Singleton;@@ -13,7 +10,7 @@ import org.hibernate.ReplicationMode;import com.gitplex.launcher.loader.Listen;import com.gitplex.server.event.lifecycle.SystemStarted;-import com.gitplex.server.event.lifecycle.SystemStarting;+import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.Project;import com.gitplex.server.model.User;@@ -23,25 +20,20 @@ import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;-import com.google.common.collect.BiMap;-import com.google.common.collect.HashBiMap;@Singletonpublic class DefaultUserManager extends AbstractEntityManager<User> implements UserManager {private final PasswordService passwordService;- private final ReadWriteLock idLock = new ReentrantReadWriteLock();-- private final BiMap<String, Long> emailToId = HashBiMap.create();-- private final BiMap<String, Long> nameToId = HashBiMap.create();-+ private final CacheManager cacheManager;+@Inject- public DefaultUserManager(Dao dao, PasswordService passwordService) {+ public DefaultUserManager(Dao dao, CacheManager cacheManager, PasswordService passwordService) {super(dao);this.passwordService = passwordService;+ this.cacheManager = cacheManager;}@Transactional@@ -61,22 +53,6 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uprotection.onUserRename(oldName, user.getName());}}-- doAfterCommit(new Runnable() {-- @Override- public void run() {- idLock.writeLock().lock();- try {- nameToId.inverse().put(user.getId(), user.getName());- if (user.getEmail() != null)- emailToId.inverse().put(user.getId(), user.getEmail());- } finally {- idLock.writeLock().unlock();- }- }-- });}@Override@@ -155,66 +131,32 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Ufor (TagProtection protection: project.getTagProtections())protection.onUserDelete(user.getName());}-- doAfterCommit(new Runnable() {-- @Override- public void run() {- idLock.writeLock().lock();- try {- emailToId.inverse().remove(user.getId());- nameToId.inverse().remove(user.getId());- } finally {- idLock.writeLock().unlock();- }- }-- });}@Sessional@Overridepublic User findByName(String userName) {- idLock.readLock().lock();- try {- Long id = nameToId.get(userName);- if (id != null)- return load(id);- else- return null;- } finally {- idLock.readLock().unlock();- }+ Long id = cacheManager.getUserIdByName(userName);+ if (id != null)+ return load(id);+ else+ return null;}@Sessional@Overridepublic User findByEmail(String email) {- idLock.readLock().lock();- try {- Long id = emailToId.get(email);- if (id != null)- return load(id);- else- return null;- } finally {- idLock.readLock().unlock();- }+ Long id = cacheManager.getUserIdByEmail(email);+ if (id != null)+ return load(id);+ else+ return null;}@Sessional@Overridepublic User find(PersonIdent person) {- idLock.readLock().lock();- try {- Long id = emailToId.get(person.getEmailAddress());- if (id != null)- return load(id);- else- return null;- } finally {- idLock.readLock().unlock();- }+ return findByEmail(person.getEmailAddress());}@Override@@ -228,20 +170,10 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Ureturn null;}- @Sessional- @Listen- public void on(SystemStarting event) {- for (User user: findAll()) {- if (user.getEmail() != null)- emailToId.inverse().put(user.getId(), user.getEmail());- nameToId.inverse().put(user.getId(), user.getName());- }- }-@Listenpublic void on(SystemStarted event) {- // Fix a critical issue that password of self-registered users are not hashedfor (User user: findAll()) {+ // Fix a critical issue that password of self-registered users are not hashedif (user.getPassword() != null && !user.getPassword().startsWith("$2a$10")&& !user.getPassword().startsWith("@hash^prefix@")) {user.setPassword(passwordService.encryptPassword(user.getPassword()));@@ -249,5 +181,5 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U}}}-+}\ No newline at end of filediff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.javaindex 2a29a4d3f3..5928f93593 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java@@ -13,7 +13,6 @@ import javax.inject.Singleton;import com.gitplex.launcher.loader.Listen;import com.gitplex.server.event.lifecycle.SystemStopping;-import com.gitplex.server.event.project.ProjectDeleted;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;import com.gitplex.server.event.pullrequest.PullRequestCodeCommentCreated;import com.gitplex.server.event.pullrequest.PullRequestCommentCreated;@@ -21,14 +20,16 @@ import com.gitplex.server.event.pullrequest.PullRequestOpened;import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.VisitInfoManager;-import com.gitplex.server.model.User;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.User;import com.gitplex.server.model.support.CodeCommentActivity;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.Dao;+import com.gitplex.server.persistence.dao.EntityRemoved;import com.gitplex.server.util.FileUtils;+import com.gitplex.server.util.VersionUtils;import jetbrains.exodus.ArrayByteIterable;import jetbrains.exodus.ByteIterable;@@ -44,9 +45,9 @@ import jetbrains.exodus.env.TransactionalExecutable;@Singletonpublic class DefaultVisitInfoManager implements VisitInfoManager {- private static final String INFO_DIR = "visit";+ private static final int INFO_VERSION = 1;- private static final String DEFAULT_STORE = "default";+ private static final String INFO_DIR = "visit";private static final String PULL_REQUEST_STORE = "pullRequest";@@ -64,19 +65,21 @@ public class DefaultVisitInfoManager implements VisitInfoManager {this.storageManager = storageManager;}- private synchronized Environment getEnv(Project project) {- Environment env = envs.get(project.getId());+ private synchronized Environment getEnv(Long projectId) {+ Environment env = envs.get(projectId);if (env == null) {+ File infoDir = getInfoDir(projectId);+ VersionUtils.checkInfoVersion(infoDir, INFO_VERSION);EnvironmentConfig config = new EnvironmentConfig();config.setEnvCloseForcedly(true);- env = Environments.newInstance(getInfoDir(project), config);- envs.put(project.getId(), env);+ env = Environments.newInstance(infoDir, config);+ envs.put(projectId, env);}return env;}- private File getInfoDir(Project project) {- File infoDir = new File(storageManager.getInfoDir(project), INFO_DIR);+ private File getInfoDir(Long projectId) {+ File infoDir = new File(storageManager.getProjectInfoDir(projectId), INFO_DIR);if (!infoDir.exists())FileUtils.createDir(infoDir);return infoDir;@@ -98,24 +101,9 @@ public class DefaultVisitInfoManager implements VisitInfoManager {return null;}- @Override- public void visit(User user, Project project) {- Environment env = getEnv(project);- Store store = getStore(env, DEFAULT_STORE);- env.executeInTransaction(new TransactionalExecutable() {-- @Override- public void execute(Transaction txn) {- store.put(txn, new StringByteIterable(user.getUUID()),- new ArrayByteIterable(longToBytes(System.currentTimeMillis()+1000L)));- }-- });- }-@Overridepublic void visit(User user, PullRequest request) {- Environment env = getEnv(request.getTargetProject());+ Environment env = getEnv(request.getTargetProject().getId());Store store = getStore(env, PULL_REQUEST_STORE);env.executeInTransaction(new TransactionalExecutable() {@@ -130,7 +118,7 @@ public class DefaultVisitInfoManager implements VisitInfoManager {@Overridepublic void visit(User user, CodeComment comment) {- Environment env = getEnv(comment.getRequest().getTargetProject());+ Environment env = getEnv(comment.getRequest().getTargetProject().getId());Store store = getStore(env, CODE_COMMENT_STORE);env.executeInTransaction(new TransactionalExecutable() {@@ -143,27 +131,9 @@ public class DefaultVisitInfoManager implements VisitInfoManager {});}- @Override- public Date getVisitDate(User user, Project project) {- Environment env = getEnv(project);- Store store = getStore(env, DEFAULT_STORE);- return env.computeInTransaction(new TransactionalComputable<Date>() {-- @Override- public Date compute(Transaction txn) {- byte[] bytes = getBytes(store.get(txn, new StringByteIterable(user.getUUID())));- if (bytes != null)- return new Date(bytesToLong(bytes));- else- return null;- }-- });- }-@Overridepublic Date getVisitDate(User user, PullRequest request) {- Environment env = getEnv(request.getTargetProject());+ Environment env = getEnv(request.getTargetProject().getId());Store store = getStore(env, PULL_REQUEST_STORE);return env.computeInTransaction(new TransactionalComputable<Date>() {@@ -181,7 +151,7 @@ public class DefaultVisitInfoManager implements VisitInfoManager {@Overridepublic Date getVisitDate(User user, CodeComment comment) {- Environment env = getEnv(comment.getRequest().getTargetProject());+ Environment env = getEnv(comment.getRequest().getTargetProject().getId());Store store = getStore(env, CODE_COMMENT_STORE);return env.computeInTransaction(new TransactionalComputable<Date>() {@@ -243,20 +213,22 @@ public class DefaultVisitInfoManager implements VisitInfoManager {@Transactional@Listen- public void on(ProjectDeleted event) {- Long projectId = event.getProject().getId();- dao.doAfterCommit(new Runnable() {+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Project) {+ Long projectId = event.getEntity().getId();+ dao.doAfterCommit(new Runnable() {- @Override- public void run() {- synchronized (envs) {- Environment env = envs.remove(projectId);- if (env != null)- env.close();+ @Override+ public void run() {+ synchronized (envs) {+ Environment env = envs.remove(projectId);+ if (env != null)+ env.close();+ }}- }-- });++ });+ }}@Listendiff --git a/core/src/main/java/com/gitplex/server/model/AbstractEntity.java b/core/src/main/java/com/gitplex/server/model/AbstractEntity.javaindex 89c48e1556..71c59dc2a7 100644--- a/core/src/main/java/com/gitplex/server/model/AbstractEntity.java+++ b/core/src/main/java/com/gitplex/server/model/AbstractEntity.java@@ -35,15 +35,17 @@ public abstract class AbstractEntity implements Serializable, Comparable<Abstrac@Overridepublic boolean equals(Object other) {- if (!(other instanceof AbstractEntity))- return false;- if (this == other)+ if (this == other) {return true;- AbstractEntity otherEntity = (AbstractEntity) other;- if (getId() == null || otherEntity.getId() == null)- return super.equals(other);- else- return new EqualsBuilder().append(getId(), otherEntity.getId()).isEquals();+ } else if (other instanceof AbstractEntity) {+ AbstractEntity otherEntity = (AbstractEntity) other;+ if (getId() == null || otherEntity.getId() == null)+ return super.equals(other);+ else+ return new EqualsBuilder().append(getId(), otherEntity.getId()).isEquals();+ } else {+ return false;+ }}@Overridediff --git a/core/src/main/java/com/gitplex/server/model/Group.java b/core/src/main/java/com/gitplex/server/model/Group.javaindex 2e6d16c56c..35c830f6d1 100644--- a/core/src/main/java/com/gitplex/server/model/Group.java+++ b/core/src/main/java/com/gitplex/server/model/Group.java@@ -14,7 +14,9 @@ import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.NotEmpty;+import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.editable.annotation.Editable;+import com.gitplex.server.util.facade.GroupFacade;@Entity@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@@ -95,13 +97,8 @@ public class Group extends AbstractEntity {this.memberships = memberships;}- public boolean matches(@Nullable String searchTerm) {- if (searchTerm == null)- searchTerm = "";- else- searchTerm = searchTerm.toLowerCase().trim();-- return getName().toLowerCase().contains(searchTerm);+ public boolean matchesQuery(@Nullable String queryTerm) {+ return StringUtils.matchesQuery(name, queryTerm);}public Collection<User> getMembers() {@@ -129,5 +126,9 @@ public class Group extends AbstractEntity {Group group = (Group) entity;return getName().compareTo(group.getName());}++ public GroupFacade getFacade() {+ return new GroupFacade(this);+ }}diff --git a/core/src/main/java/com/gitplex/server/model/GroupAuthorization.java b/core/src/main/java/com/gitplex/server/model/GroupAuthorization.javaindex 46a92d2a5b..d81b269ab5 100644--- a/core/src/main/java/com/gitplex/server/model/GroupAuthorization.java+++ b/core/src/main/java/com/gitplex/server/model/GroupAuthorization.java@@ -10,6 +10,7 @@ import javax.persistence.Table;import javax.persistence.UniqueConstraint;import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.util.facade.GroupAuthorizationFacade;@Entity@Table(@@ -55,4 +56,8 @@ public class GroupAuthorization extends AbstractEntity {this.privilege = privilege;}+ public GroupAuthorizationFacade getFacade() {+ return new GroupAuthorizationFacade(this);+ }+}diff --git a/core/src/main/java/com/gitplex/server/model/Membership.java b/core/src/main/java/com/gitplex/server/model/Membership.javaindex 4d5e241acc..7cc6916ee8 100644--- a/core/src/main/java/com/gitplex/server/model/Membership.java+++ b/core/src/main/java/com/gitplex/server/model/Membership.java@@ -8,6 +8,8 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;+import com.gitplex.server.util.facade.MembershipFacade;+@Entity@Table(indexes={@Index(columnList="g_user_id"), @Index(columnList="g_group_id")},@@ -41,4 +43,8 @@ public class Membership extends AbstractEntity {this.group = group;}+ public MembershipFacade getFacade() {+ return new MembershipFacade(this);+ }+}diff --git a/core/src/main/java/com/gitplex/server/model/Project.java b/core/src/main/java/com/gitplex/server/model/Project.javaindex 8b2554960b..26f15cf31d 100644--- a/core/src/main/java/com/gitplex/server/model/Project.java+++ b/core/src/main/java/com/gitplex/server/model/Project.java@@ -58,7 +58,6 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.annotations.DynamicUpdate;import org.hibernate.validator.constraints.NotEmpty;-import com.gitplex.launcher.loader.AppLoader;import com.gitplex.launcher.loader.ListenerRegistry;import com.gitplex.launcher.loader.LoaderUtils;import com.gitplex.server.GitPlex;@@ -71,10 +70,10 @@ import com.gitplex.server.git.RefInfo;import com.gitplex.server.git.Submodule;import com.gitplex.server.git.exception.NotFileException;import com.gitplex.server.git.exception.ObjectNotFoundException;+import com.gitplex.server.manager.CommitInfoManager;import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.StorageManager;-import com.gitplex.server.manager.VisitInfoManager;import com.gitplex.server.model.support.BranchProtection;import com.gitplex.server.model.support.CommitMessageTransformSetting;import com.gitplex.server.model.support.TagProtection;@@ -86,6 +85,7 @@ import com.gitplex.server.util.PathUtils;import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.editable.annotation.Markdown;+import com.gitplex.server.util.facade.ProjectFacade;import com.gitplex.server.util.validation.annotation.ProjectName;import com.google.common.base.Optional;import com.google.common.base.Preconditions;@@ -165,12 +165,14 @@ public class Project extends AbstractEntity {private transient Map<String, Optional<Ref>> refCache;- private transient Optional<String> defaultBranch;+ private transient Optional<String> defaultBranchOptional;private transient Collection<Group> authorizedGroups;private transient Collection<User> authorizedUsers;+ private transient Optional<RevCommit> lastCommitOptional;+@Editable(order=100)@ProjectName@NotEmpty@@ -303,7 +305,7 @@ public class Project extends AbstractEntity {}public File getGitDir() {- return AppLoader.getInstance(StorageManager.class).getGitDir(this);+ return GitPlex.getInstance(StorageManager.class).getProjectGitDir(getId());}/**@@ -349,28 +351,28 @@ public class Project extends AbstractEntity {@Nullablepublic String getDefaultBranch() {- if (defaultBranch == null) {+ if (defaultBranchOptional == null) {try {Ref headRef = getRepository().findRef("HEAD");if (headRef != null&& headRef.isSymbolic()&& headRef.getTarget().getName().startsWith(Constants.R_HEADS)&& headRef.getObjectId() != null) {- defaultBranch = Optional.of(Repository.shortenRefName(headRef.getTarget().getName()));+ defaultBranchOptional = Optional.of(Repository.shortenRefName(headRef.getTarget().getName()));} else {- defaultBranch = Optional.absent();+ defaultBranchOptional = Optional.absent();}} catch (IOException e) {throw new RuntimeException(e);}}- return defaultBranch.orNull();+ return defaultBranchOptional.orNull();}public void setDefaultBranch(String defaultBranchName) {RefUpdate refUpdate = updateRef("HEAD");GitUtils.linkRef(refUpdate, GitUtils.branch2ref(defaultBranchName));- defaultBranch = null;+ defaultBranchOptional = null;}private Map<BlobIdent, Blob> getBlobCache() {@@ -492,7 +494,7 @@ public class Project extends AbstractEntity {path = "";final File cacheDir = new File(- GitPlex.getInstance(StorageManager.class).getInfoDir(this),+ GitPlex.getInstance(StorageManager.class).getProjectInfoDir(getId()),"last_commits/" + path + "/gitplex_last_commits");final ReadWriteLock lock;@@ -768,13 +770,8 @@ public class Project extends AbstractEntity {return version;}- public boolean matches(@Nullable String searchTerm) {- if (searchTerm == null)- searchTerm = "";- else- searchTerm = searchTerm.toLowerCase().trim();-- return getName().toLowerCase().contains(searchTerm);+ public boolean matchesQuery(@Nullable String queryTerm) {+ return StringUtils.matchesQuery(name, queryTerm);}public RefUpdate updateRef(String refName) {@@ -812,27 +809,6 @@ public class Project extends AbstractEntity {}}- public static int compareLastVisit(Project project1, Project project2) {- User user = SecurityUtils.getUser();- if (user != null) {- Date date1 = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, project1);- Date date2 = GitPlex.getInstance(VisitInfoManager.class).getVisitDate(user, project2);- if (date1 != null) {- if (date2 != null)- return date2.compareTo(date1);- else- return -1;- } else {- if (date2 != null)- return 1;- else- return project1.compareTo(project2);- }- } else {- return project1.compareTo(project2);- }- }-public int getMode(String revision, @Nullable String path) {if (path != null) {RevCommit commit = getRevCommit(revision);@@ -890,4 +866,35 @@ public class Project extends AbstractEntity {return authorizedUsers;}+ public ProjectFacade getFacade() {+ return new ProjectFacade(this);+ }++ public RevCommit getLastCommit() {+ if (lastCommitOptional == null) {+ ObjectId commitId = GitPlex.getInstance(CommitInfoManager.class).getLastCommit(this);+ if (commitId == null) {+ RevCommit lastCommit = null;+ try {+ for (Ref ref: getRepository().getRefDatabase().getRefs(Constants.R_HEADS).values()) {+ RevCommit commit = getRevCommit(ref.getObjectId(), false);+ if (commit != null) {+ if (lastCommit != null) {+ if (commit.getCommitTime() > lastCommit.getCommitTime())+ lastCommit = commit;+ } else {+ lastCommit = commit;+ }+ }+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ lastCommitOptional = Optional.fromNullable(lastCommit);+ } else {+ lastCommitOptional = Optional.fromNullable(getRevCommit(commitId));+ }+ }+ return lastCommitOptional.orNull();+ }}diff --git a/core/src/main/java/com/gitplex/server/model/PullRequest.java b/core/src/main/java/com/gitplex/server/model/PullRequest.javaindex 2380a39246..7b4c8f4ac2 100644--- a/core/src/main/java/com/gitplex/server/model/PullRequest.java+++ b/core/src/main/java/com/gitplex/server/model/PullRequest.java@@ -5,7 +5,6 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;-import java.util.Comparator;import java.util.Date;import java.util.HashSet;import java.util.List;@@ -44,11 +43,10 @@ import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.ReviewManager;import com.gitplex.server.manager.VisitInfoManager;import com.gitplex.server.model.support.CloseInfo;-import com.gitplex.server.model.support.ProjectAndBranch;import com.gitplex.server.model.support.LastEvent;import com.gitplex.server.model.support.MergePreview;import com.gitplex.server.model.support.MergeStrategy;-import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.model.support.ProjectAndBranch;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.ReviewStatus;import com.gitplex.server.util.diff.WhitespaceOption;@@ -733,18 +731,6 @@ public class PullRequest extends AbstractEntity {return null;}- public List<User> getRemainingReviewers() {- ReviewStatus checkStatus = getReviewStatus();- Collection<User> users = SecurityUtils.findUsersCan(getTargetProject(), ProjectPrivilege.READ);- users.removeAll(checkStatus.getAwaitingReviewers());- for (Review review: checkStatus.getEffectiveReviews().values())- users.remove(review.getUser());- users.remove(SecurityUtils.getUser());- List<User> userList = new ArrayList<>(users);- userList.sort(Comparator.comparing(User::getName));- return userList;- }-public static class ComparingInfo implements Serializable {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/com/gitplex/server/model/User.java b/core/src/main/java/com/gitplex/server/model/User.javaindex 78e7eaa231..df96058b64 100644--- a/core/src/main/java/com/gitplex/server/model/User.java+++ b/core/src/main/java/com/gitplex/server/model/User.java@@ -27,17 +27,15 @@ import org.hibernate.validator.constraints.Email;import org.hibernate.validator.constraints.NotEmpty;import com.gitplex.launcher.loader.AppLoader;-import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.editable.annotation.Password;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.util.validation.annotation.UserName;import com.google.common.base.Objects;import com.google.common.base.Preconditions;@Entity-@Table(indexes={- @Index(columnList="email"), @Index(columnList="fullName"),- @Index(columnList="noSpaceName"), @Index(columnList="noSpaceFullName")})+@Table(indexes={@Index(columnList="email"), @Index(columnList="fullName")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editablepublic class User extends AbstractEntity implements AuthenticationInfo {@@ -57,11 +55,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Column(unique=true)private String email;- @Column(nullable=false)- private String noSpaceName;-- private String noSpaceFullName;-@Column(nullable=false)private String uuid = UUID.randomUUID().toString();@@ -135,7 +128,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {public void setName(String name) {this.name = name;- noSpaceName = StringUtils.deleteWhitespace(name);}@Editable(order=150, autocomplete="new-password")@@ -166,7 +158,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {public void setFullName(String fullName) {this.fullName = fullName;- noSpaceFullName = StringUtils.deleteWhitespace(fullName);}@Editable(order=300)@@ -196,17 +187,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.requestTasks = requestTasks;}- @Nullable- public Review getReviewAfter(PullRequestUpdate update) {- for (Review review: update.getRequest().getReviews()) {- if (review.getUser().equals(this) && review.getUpdate() != null- && review.getUpdate().getId()>=update.getId()) {- return review;- }- }- return null;- }-@Overridepublic String toString() {return Objects.toStringHelper(this)@@ -225,28 +205,10 @@ public class User extends AbstractEntity implements AuthenticationInfo {return getName();}- public boolean matches(@Nullable String searchTerm) {- if (searchTerm == null)- searchTerm = "";- else- searchTerm = searchTerm.toLowerCase().trim();-- return getName().toLowerCase().contains(searchTerm)- || fullName!=null && fullName.toLowerCase().contains(searchTerm);- }-public boolean isRoot() {return ROOT_ID.equals(getId());}- public String getNoSpaceName() {- return noSpaceName;- }-- public String getNoSpaceFullName() {- return noSpaceFullName;- }-public long getVersion() {return version;}@@ -304,5 +266,9 @@ public class User extends AbstractEntity implements AuthenticationInfo {}return groups;}++ public UserFacade getFacade() {+ return new UserFacade(this);+ }}diff --git a/core/src/main/java/com/gitplex/server/model/UserAuthorization.java b/core/src/main/java/com/gitplex/server/model/UserAuthorization.javaindex 3bf164fdf4..e108d8c537 100644--- a/core/src/main/java/com/gitplex/server/model/UserAuthorization.java+++ b/core/src/main/java/com/gitplex/server/model/UserAuthorization.java@@ -10,6 +10,7 @@ import javax.persistence.Table;import javax.persistence.UniqueConstraint;import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.util.facade.UserAuthorizationFacade;@Entity@Table(@@ -55,4 +56,8 @@ public class UserAuthorization extends AbstractEntity {this.privilege = privilege;}+ public UserAuthorizationFacade getFacade() {+ return new UserAuthorizationFacade(this);+ }+}diff --git a/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectAdministrators.java b/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectAdministrators.javaindex cbfec3bd0d..b636f9be00 100644--- a/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectAdministrators.java+++ b/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectAdministrators.java@@ -6,14 +6,14 @@ import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.permission.ProjectPermission;import com.gitplex.server.util.editable.annotation.Editable;-@Editable(order=200, name="Repository Administrators")+@Editable(order=200, name="Project Administrators")public class ProjectAdministrators implements TagCreator {private static final long serialVersionUID = 1L;@Overridepublic String getNotMatchMessage(Project project, User user) {- if (!user.asSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.ADMIN))) {+ if (!user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMIN))) {return "This operation can only be performed by project administrators";} else {return null;diff --git a/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectWriters.java b/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectWriters.javaindex d161732712..1c2c4f5c64 100644--- a/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectWriters.java+++ b/core/src/main/java/com/gitplex/server/model/support/tagcreator/ProjectWriters.java@@ -6,14 +6,14 @@ import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.permission.ProjectPermission;import com.gitplex.server.util.editable.annotation.Editable;-@Editable(order=100, name="All Users Able to Write to the Repository")+@Editable(order=100, name="All Users Able to Write the Project")public class ProjectWriters implements TagCreator {private static final long serialVersionUID = 1L;@Overridepublic String getNotMatchMessage(Project project, User user) {- if (!user.asSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.WRITE))) {+ if (!user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.WRITE))) {return "This operation can only be performed by project writers";} else {return null;diff --git a/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedUser.java b/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedUser.javaindex 63a6e126a0..b5c2a44d34 100644--- a/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedUser.java+++ b/core/src/main/java/com/gitplex/server/model/support/tagcreator/SpecifiedUser.java@@ -18,7 +18,7 @@ public class SpecifiedUser implements TagCreator {private String userName;@Editable(name="User")- @UserChoice(type=UserChoice.Type.DEPOT_WRITER)+ @UserChoice(type=UserChoice.Type.PROJECT_WRITER)@NotEmptypublic String getUserName() {return userName;diff --git a/core/src/main/java/com/gitplex/server/security/SecurityRealm.java b/core/src/main/java/com/gitplex/server/security/SecurityRealm.javaindex e2a2ccb474..6fdc4e54e5 100644--- a/core/src/main/java/com/gitplex/server/security/SecurityRealm.java+++ b/core/src/main/java/com/gitplex/server/security/SecurityRealm.java@@ -19,30 +19,34 @@ import org.apache.shiro.realm.AuthorizingRealm;import org.apache.shiro.subject.PrincipalCollection;import com.gitplex.launcher.loader.AppLoader;-import com.gitplex.server.manager.MembershipManager;+import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.UserManager;-import com.gitplex.server.model.GroupAuthorization;-import com.gitplex.server.model.Membership;-import com.gitplex.server.model.User;-import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.security.permission.CreateProjects;import com.gitplex.server.security.permission.ProjectPermission;import com.gitplex.server.security.permission.PublicPermission;import com.gitplex.server.security.permission.SystemAdministration;import com.gitplex.server.security.permission.UserAdministration;+import com.gitplex.server.util.facade.GroupAuthorizationFacade;+import com.gitplex.server.util.facade.GroupFacade;+import com.gitplex.server.util.facade.MembershipFacade;+import com.gitplex.server.util.facade.UserAuthorizationFacade;+import com.gitplex.server.util.facade.UserFacade;@Singletonpublic class SecurityRealm extends AuthorizingRealm {private final UserManager userManager;+ private final CacheManager cacheManager;+@Inject- public SecurityRealm(UserManager userManager, MembershipManager groupMembershipManager) {+ public SecurityRealm(UserManager userManager, CacheManager cacheManager) {PasswordMatcher passwordMatcher = new PasswordMatcher();passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));setCredentialsMatcher(passwordMatcher);this.userManager = userManager;+ this.cacheManager = cacheManager;}@SuppressWarnings("serial")@@ -67,24 +71,34 @@ public class SecurityRealm extends AuthorizingRealm {Collection<Permission> permissions = new ArrayList<>();permissions.add(new PublicPermission());if (userId != 0L) {- User user = userManager.get(userId);+ UserFacade user = cacheManager.getUser(userId);if (user != null) {if (user.isRoot())permissions.add(new SystemAdministration());permissions.add(new UserAdministration(user));- for (Membership membership: user.getMemberships()) {- if (membership.getGroup().isAdministrator())- permissions.add(new SystemAdministration());- if (membership.getGroup().isCanCreateProjects())- permissions.add(new CreateProjects());- for (GroupAuthorization authorization: membership.getGroup().getAuthorizations()) {- permissions.add(new ProjectPermission(- authorization.getProject(), authorization.getPrivilege()));+ for (MembershipFacade membership: cacheManager.getMemberships().values()) {+ if (membership.getUserId().equals(userId)) {+ GroupFacade group = cacheManager.getGroup(membership.getGroupId());+ if (group.isAdministrator())+ permissions.add(new SystemAdministration());+ if (group.isCanCreateProjects())+ permissions.add(new CreateProjects());+ for (GroupAuthorizationFacade authorization:+ cacheManager.getGroupAuthorizations().values()) {+ if (authorization.getGroupId().equals(group.getId())) {+ permissions.add(new ProjectPermission(+ cacheManager.getProject(authorization.getProjectId()),+ authorization.getPrivilege()));+ }+ }}}- for (UserAuthorization authorization: user.getAuthorizations()) {- permissions.add(new ProjectPermission(- authorization.getProject(), authorization.getPrivilege()));+ for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {+ if (authorization.getUserId().equals(userId)) {+ permissions.add(new ProjectPermission(+ cacheManager.getProject(authorization.getProjectId()),+ authorization.getPrivilege()));+ }}}}diff --git a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java b/core/src/main/java/com/gitplex/server/security/SecurityUtils.javaindex 5a99113845..8db2fa5f9d 100644--- a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java+++ b/core/src/main/java/com/gitplex/server/security/SecurityUtils.java@@ -9,6 +9,7 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.ReviewManager;import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.CodeComment;@@ -25,16 +26,46 @@ import com.gitplex.server.security.permission.CreateProjects;import com.gitplex.server.security.permission.ProjectPermission;import com.gitplex.server.security.permission.SystemAdministration;import com.gitplex.server.security.permission.UserAdministration;+import com.gitplex.server.util.facade.GroupAuthorizationFacade;+import com.gitplex.server.util.facade.GroupFacade;+import com.gitplex.server.util.facade.MembershipFacade;+import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.util.facade.UserAuthorizationFacade;+import com.gitplex.server.util.facade.UserFacade;public class SecurityUtils extends org.apache.shiro.SecurityUtils {- public static Collection<User> findUsersCan(Project project, ProjectPrivilege privilege) {- Set<User> authorizedUsers = new HashSet<User>();- for (User user: GitPlex.getInstance(UserManager.class).findAll()) {- if (user.asSubject().isPermitted(new ProjectPermission(project, privilege))) {+ public static Collection<UserFacade> getAuthorizedUsers(ProjectFacade project, ProjectPrivilege privilege) {+ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);+ Collection<UserFacade> authorizedUsers = new HashSet<>();+ if (project.isPublicRead() && privilege == ProjectPrivilege.READ) {+ for (UserFacade user: cacheManager.getUsers().values())authorizedUsers.add(user);+ } else {+ authorizedUsers.add(GitPlex.getInstance(UserManager.class).getRoot().getFacade());++ Set<Long> authorizedGroupIds = new HashSet<>();+ for (GroupFacade group: cacheManager.getGroups().values()) {+ if (group.isAdministrator())+ authorizedGroupIds.add(group.getId());+ }+ for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {+ if (authorization.getProjectId().equals(project.getId()) && authorization.getPrivilege().implies(privilege))+ authorizedGroupIds.add(authorization.getGroupId());+ }+ for (MembershipFacade membership: cacheManager.getMemberships().values()) {+ if (authorizedGroupIds.contains(membership.getGroupId()))+ authorizedUsers.add(cacheManager.getUser(membership.getUserId()));+ }++ for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {+ if (authorization.getProjectId().equals(project.getId())+ && authorization.getPrivilege().implies(privilege)) {+ authorizedUsers.add(cacheManager.getUser(authorization.getUserId()));+ }}}+return authorizedUsers;}@@ -145,7 +176,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}public static boolean canManage(User user) {- return getSubject().isPermitted(new UserAdministration(user));+ return getSubject().isPermitted(new UserAdministration(user.getFacade()));}public static boolean canCreateProjects() {@@ -153,15 +184,15 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}public static boolean canRead(Project project) {- return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.READ));+ return getSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.READ));}public static boolean canWrite(Project project) {- return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.WRITE));+ return getSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.WRITE));}public static boolean canManage(Project project) {- return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.ADMIN));+ return getSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMIN));}public static boolean isAdministrator() {diff --git a/core/src/main/java/com/gitplex/server/security/permission/ProjectPermission.java b/core/src/main/java/com/gitplex/server/security/permission/ProjectPermission.javaindex eff3e01360..47bcf09160 100644--- a/core/src/main/java/com/gitplex/server/security/permission/ProjectPermission.java+++ b/core/src/main/java/com/gitplex/server/security/permission/ProjectPermission.java@@ -2,21 +2,21 @@ package com.gitplex.server.security.permission;import org.apache.shiro.authz.Permission;-import com.gitplex.server.model.Project;import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.util.facade.ProjectFacade;public class ProjectPermission implements Permission {- private final Project project;+ private final ProjectFacade project;private final ProjectPrivilege privilege;- public ProjectPermission(Project project, ProjectPrivilege privilege) {+ public ProjectPermission(ProjectFacade project, ProjectPrivilege privilege) {this.project = project;this.privilege = privilege;}- public Project getProject() {+ public ProjectFacade getProject() {return project;}diff --git a/core/src/main/java/com/gitplex/server/security/permission/UserAdministration.java b/core/src/main/java/com/gitplex/server/security/permission/UserAdministration.javaindex 392a1b7a52..b3a445a811 100644--- a/core/src/main/java/com/gitplex/server/security/permission/UserAdministration.java+++ b/core/src/main/java/com/gitplex/server/security/permission/UserAdministration.java@@ -2,17 +2,17 @@ package com.gitplex.server.security.permission;import org.apache.shiro.authz.Permission;-import com.gitplex.server.model.User;+import com.gitplex.server.util.facade.UserFacade;public class UserAdministration implements Permission {- private final User user;+ private final UserFacade user;- public UserAdministration(User user) {+ public UserAdministration(UserFacade user) {this.user = user;}- public User getUser() {+ public UserFacade getUser() {return user;}diff --git a/core/src/main/java/com/gitplex/server/util/FileUtils.java b/core/src/main/java/com/gitplex/server/util/FileUtils.javaindex f92db0c6c3..a2e2574f34 100644--- a/core/src/main/java/com/gitplex/server/util/FileUtils.java+++ b/core/src/main/java/com/gitplex/server/util/FileUtils.java@@ -332,5 +332,5 @@ public class FileUtils extends org.apache.commons.io.FileUtils {return result;}-+}diff --git a/core/src/main/java/com/gitplex/server/util/StringUtils.java b/core/src/main/java/com/gitplex/server/util/StringUtils.javaindex 99e71c56d7..fb9c0fd725 100644--- a/core/src/main/java/com/gitplex/server/util/StringUtils.java+++ b/core/src/main/java/com/gitplex/server/util/StringUtils.java@@ -298,5 +298,17 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {public static String escapeHtml(String text) {return TokenUtils.escapeHtml(text);}++ public static boolean matchesQuery(@Nullable String name, @Nullable String queryTerm) {+ if (queryTerm == null)+ queryTerm = "";+ else+ queryTerm = queryTerm.toLowerCase().trim();+ if (name == null)+ name = "";+ else+ name = name.toLowerCase().trim();+ return name.contains(queryTerm);+ }}diff --git a/core/src/main/java/com/gitplex/server/util/VersionUtils.java b/core/src/main/java/com/gitplex/server/util/VersionUtils.javanew file mode 100644index 0000000000..36138e4835--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/VersionUtils.java@@ -0,0 +1,33 @@+package com.gitplex.server.util;++import java.io.File;+import java.io.IOException;++public class VersionUtils {++ private static final String INFO_VERSION_FILE = "version.txt";++ public static void checkInfoVersion(File infoDir, int infoVersion) {+ File versionFile = new File(infoDir, INFO_VERSION_FILE);+ int infoVersionFromFile;+ if (versionFile.exists()) {+ try {+ infoVersionFromFile = Integer.parseInt(FileUtils.readFileToString(versionFile).trim());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else {+ infoVersionFromFile = 0;+ }+ if (infoVersionFromFile != infoVersion) {+ FileUtils.cleanDir(versionFile.getParentFile());+ FileUtils.writeFile(versionFile, String.valueOf(infoVersion));+ }+ }++ public static void writeInfoVersion(File infoDir, int infoVersion) {+ File versionFile = new File(infoDir, INFO_VERSION_FILE);+ FileUtils.writeFile(versionFile, String.valueOf(infoVersion));+ }++}diff --git a/core/src/main/java/com/gitplex/server/util/editable/annotation/UserChoice.java b/core/src/main/java/com/gitplex/server/util/editable/annotation/UserChoice.javaindex 147971d33f..96d2917d6c 100644--- a/core/src/main/java/com/gitplex/server/util/editable/annotation/UserChoice.java+++ b/core/src/main/java/com/gitplex/server/util/editable/annotation/UserChoice.java@@ -9,7 +9,7 @@ import java.lang.annotation.Target;@Retention(RetentionPolicy.RUNTIME)public @interface UserChoice {- public enum Type{ALL, DEPOT_READER, DEPOT_WRITER, DEPOT_ADMINISTRATOR}+ public enum Type{ALL, PROJECT_READER, PROJECT_WRITER, PROJECT_ADMINISTRATOR}Type type() default Type.ALL;}diff --git a/core/src/main/java/com/gitplex/server/util/facade/EntityFacade.java b/core/src/main/java/com/gitplex/server/util/facade/EntityFacade.javaindex 1190caf8ac..6004005c53 100644--- a/core/src/main/java/com/gitplex/server/util/facade/EntityFacade.java+++ b/core/src/main/java/com/gitplex/server/util/facade/EntityFacade.java@@ -2,7 +2,10 @@ package com.gitplex.server.util.facade;import java.io.Serializable;-public class EntityFacade implements Serializable {+import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;++public class EntityFacade implements Serializable, Comparable<EntityFacade> {private static final long serialVersionUID = 1L;@@ -16,4 +19,29 @@ public class EntityFacade implements Serializable {return id;}+ @Override+ public boolean equals(Object other) {+ if (this == other) {+ return true;+ } else if (other instanceof EntityFacade) {+ EntityFacade otherEntity = (EntityFacade) other;+ return new EqualsBuilder().append(getId(), otherEntity.getId()).isEquals();+ } else {+ return false;+ }+ }++ @Override+ public int hashCode() {+ if (getId() == null)+ return super.hashCode();+ else+ return new HashCodeBuilder(17, 37).append(getId()).toHashCode();+ }++ @Override+ public int compareTo(EntityFacade entity) {+ return getId().compareTo(entity.getId());+ }+}diff --git a/core/src/main/java/com/gitplex/server/util/facade/GroupAuthorizationFacade.java b/core/src/main/java/com/gitplex/server/util/facade/GroupAuthorizationFacade.javaindex e587c7a0ae..517535e639 100644--- a/core/src/main/java/com/gitplex/server/util/facade/GroupAuthorizationFacade.java+++ b/core/src/main/java/com/gitplex/server/util/facade/GroupAuthorizationFacade.java@@ -1,5 +1,8 @@package com.gitplex.server.util.facade;+import com.gitplex.server.model.GroupAuthorization;+import com.gitplex.server.security.ProjectPrivilege;+public class GroupAuthorizationFacade extends EntityFacade {private static final long serialVersionUID = 1L;@@ -8,11 +11,14 @@ public class GroupAuthorizationFacade extends EntityFacade {private final Long projectId;- public GroupAuthorizationFacade(Long id, Long groupId, Long projectId) {- super(id);+ private final ProjectPrivilege privilege;- this.groupId = groupId;- this.projectId = projectId;+ public GroupAuthorizationFacade(GroupAuthorization groupAuthorization) {+ super(groupAuthorization.getId());++ groupId = groupAuthorization.getGroup().getId();+ projectId = groupAuthorization.getProject().getId();+ privilege = groupAuthorization.getPrivilege();}public Long getGroupId() {@@ -23,4 +29,8 @@ public class GroupAuthorizationFacade extends EntityFacade {return projectId;}+ public ProjectPrivilege getPrivilege() {+ return privilege;+ }+}diff --git a/core/src/main/java/com/gitplex/server/util/facade/GroupFacade.java b/core/src/main/java/com/gitplex/server/util/facade/GroupFacade.javaindex dda3430496..3444cde6bc 100644--- a/core/src/main/java/com/gitplex/server/util/facade/GroupFacade.java+++ b/core/src/main/java/com/gitplex/server/util/facade/GroupFacade.java@@ -1,18 +1,41 @@package com.gitplex.server.util.facade;+import javax.annotation.Nullable;++import com.gitplex.server.model.Group;+import com.gitplex.server.util.StringUtils;+public class GroupFacade extends EntityFacade {private static final long serialVersionUID = 1L;private final String name;- public GroupFacade(Long id, String name) {- super(id);- this.name = name;+ private final boolean administrator;++ private final boolean canCreateProjects;++ public GroupFacade(Group group) {+ super(group.getId());+ name = group.getName();+ administrator = group.isAdministrator();+ canCreateProjects = group.isCanCreateProjects();}public String getName() {return name;}++ public boolean isAdministrator() {+ return administrator;+ }++ public boolean isCanCreateProjects() {+ return canCreateProjects;+ }++ public boolean matchesQuery(@Nullable String queryTerm) {+ return StringUtils.matchesQuery(name, queryTerm);+ }}diff --git a/core/src/main/java/com/gitplex/server/util/facade/MembershipFacade.java b/core/src/main/java/com/gitplex/server/util/facade/MembershipFacade.javaindex 8f04d5e5b2..b8e27df992 100644--- a/core/src/main/java/com/gitplex/server/util/facade/MembershipFacade.java+++ b/core/src/main/java/com/gitplex/server/util/facade/MembershipFacade.java@@ -1,5 +1,7 @@package com.gitplex.server.util.facade;+import com.gitplex.server.model.Membership;+public class MembershipFacade extends EntityFacade {private static final long serialVersionUID = 1L;@@ -8,11 +10,11 @@ public class MembershipFacade extends EntityFacade {private final Long userId;- public MembershipFacade(Long id, Long groupId, Long userId) {- super(id);+ public MembershipFacade(Membership membership) {+ super(membership.getId());- this.groupId = groupId;- this.userId = userId;+ groupId = membership.getGroup().getId();+ userId = membership.getUser().getId();}public Long getGroupId() {diff --git a/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.java b/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.javaindex 54a79f20b3..c7966effbd 100644--- a/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.java+++ b/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.java@@ -1,25 +1,70 @@package com.gitplex.server.util.facade;+import java.util.Date;++import javax.annotation.Nullable;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.UserInfoManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.model.User;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.util.StringUtils;+public class ProjectFacade extends EntityFacade {private static final long serialVersionUID = 1L;- private final Long userId;-private final String name;++ private final String uuid;++ private final boolean publicRead;- public ProjectFacade(Long id, Long userId, String name) {- super(id);- this.userId = userId;- this.name = name;+ public ProjectFacade(Project project) {+ super(project.getId());+ name = project.getName();+ uuid = project.getUUID();+ publicRead = project.isPublicRead();}- public Long getUserId() {- return userId;- }-public String getName() {return name;}+ public boolean isPublicRead() {+ return publicRead;+ }++ public String getUUID() {+ return uuid;+ }++ public boolean matchesQuery(@Nullable String queryTerm) {+ return StringUtils.matchesQuery(name, queryTerm);+ }++ public static int compareLastVisit(ProjectFacade project1, ProjectFacade project2) {+ User user = SecurityUtils.getUser();+ if (user != null) {+ UserInfoManager userInfoManager = GitPlex.getInstance(UserInfoManager.class);+ UserFacade userFacade = user.getFacade();+ Date date1 = userInfoManager.getVisitDate(userFacade, project1);+ Date date2 = userInfoManager.getVisitDate(userFacade, project2);+ if (date1 != null) {+ if (date2 != null)+ return date2.compareTo(date1);+ else+ return -1;+ } else {+ if (date2 != null)+ return 1;+ else+ return project1.compareTo(project2);+ }+ } else {+ return project1.compareTo(project2);+ }+ }+}diff --git a/core/src/main/java/com/gitplex/server/util/facade/UserAuthorizationFacade.java b/core/src/main/java/com/gitplex/server/util/facade/UserAuthorizationFacade.javaindex 18e3fdfcae..c5648619c3 100644--- a/core/src/main/java/com/gitplex/server/util/facade/UserAuthorizationFacade.java+++ b/core/src/main/java/com/gitplex/server/util/facade/UserAuthorizationFacade.java@@ -1,5 +1,8 @@package com.gitplex.server.util.facade;+import com.gitplex.server.model.UserAuthorization;+import com.gitplex.server.security.ProjectPrivilege;+public class UserAuthorizationFacade extends EntityFacade {private static final long serialVersionUID = 1L;@@ -8,11 +11,14 @@ public class UserAuthorizationFacade extends EntityFacade {private final Long projectId;- public UserAuthorizationFacade(Long id, Long userId, Long projectId) {- super(id);-- this.userId = userId;- this.projectId = projectId;+ private final ProjectPrivilege privilege;++ public UserAuthorizationFacade(UserAuthorization userAuthorization) {+ super(userAuthorization.getId());++ userId = userAuthorization.getUser().getId();+ projectId = userAuthorization.getProject().getId();+ privilege = userAuthorization.getPrivilege();}public Long getUserId() {@@ -22,5 +28,9 @@ public class UserAuthorizationFacade extends EntityFacade {public Long getProjectId() {return projectId;}++ public ProjectPrivilege getPrivilege() {+ return privilege;+ }}diff --git a/core/src/main/java/com/gitplex/server/util/facade/UserFacade.java b/core/src/main/java/com/gitplex/server/util/facade/UserFacade.javaindex e686e06779..bb3de77a71 100644--- a/core/src/main/java/com/gitplex/server/util/facade/UserFacade.java+++ b/core/src/main/java/com/gitplex/server/util/facade/UserFacade.java@@ -1,5 +1,10 @@package com.gitplex.server.util.facade;+import javax.annotation.Nullable;++import com.gitplex.server.model.User;+import com.gitplex.server.util.StringUtils;+public class UserFacade extends EntityFacade {private static final long serialVersionUID = 1L;@@ -8,11 +13,17 @@ public class UserFacade extends EntityFacade {private final String fullName;- public UserFacade(Long id, String name, String fullName) {- super(id);-- this.name = name;- this.fullName = fullName;+ private final String email;++ private final String uuid;++ public UserFacade(User user) {+ super(user.getId());++ name = user.getName();+ fullName = user.getFullName();+ email = user.getEmail();+ uuid = user.getUUID();}public String getName() {@@ -22,5 +33,28 @@ public class UserFacade extends EntityFacade {public String getFullName() {return fullName;}++ public String getEmail() {+ return email;+ }++ public String getUUID() {+ return uuid;+ }++ public boolean isRoot() {+ return getId().equals(User.ROOT_ID);+ }++ public String getDisplayName() {+ if (getFullName() != null)+ return getFullName();+ else+ return getName();+ }++ public boolean matchesQuery(@Nullable String queryTerm) {+ return StringUtils.matchesQuery(name, queryTerm) || StringUtils.matchesQuery(fullName, queryTerm);+ }}diff --git a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.javaindex d25af587b0..3d927ad9f1 100644--- a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java+++ b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java@@ -337,7 +337,7 @@ public class DefaultIndexManager implements IndexManager {private IndexResult doIndex(Project project, ObjectId commit) {IndexResult indexResult;- File indexDir = storageManager.getIndexDir(project);+ File indexDir = storageManager.getProjectIndexDir(project.getId());try (Directory directory = FSDirectory.open(indexDir)) {if (DirectoryReader.indexExists(directory)) {try (IndexReader reader = DirectoryReader.open(directory)) {@@ -394,7 +394,7 @@ public class DefaultIndexManager implements IndexManager {@Overridepublic boolean isIndexed(Project project, ObjectId commit) {- File indexDir = storageManager.getIndexDir(project.getForkRoot());+ File indexDir = storageManager.getProjectIndexDir(project.getForkRoot().getId());try (Directory directory = FSDirectory.open(indexDir)) {if (DirectoryReader.indexExists(directory)) {try (IndexReader reader = DirectoryReader.open(directory)) {diff --git a/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java b/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.javaindex 26103f05f6..d4df398457 100644--- a/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java+++ b/search/src/main/java/com/gitplex/server/search/DefaultSearchManager.java@@ -42,11 +42,11 @@ import org.slf4j.LoggerFactory;import com.gitplex.jsymbol.Symbol;import com.gitplex.launcher.loader.Listen;import com.gitplex.server.event.lifecycle.SystemStopping;-import com.gitplex.server.event.project.ProjectDeleted;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.model.Project;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.Dao;+import com.gitplex.server.persistence.dao.EntityRemoved;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.search.query.BlobQuery;import com.google.common.base.Throwables;@@ -75,7 +75,7 @@ public class DefaultSearchManager implements SearchManager {if (searcherManager == null) synchronized (searcherManagers) {searcherManager = searcherManagers.get(project.getId());if (searcherManager == null) {- Directory directory = FSDirectory.open(storageManager.getIndexDir(project));+ Directory directory = FSDirectory.open(storageManager.getProjectIndexDir(project.getId()));if (DirectoryReader.indexExists(directory)) {searcherManager = new SearcherManager(directory, null);searcherManagers.put(project.getId(), searcherManager);@@ -241,26 +241,28 @@ public class DefaultSearchManager implements SearchManager {@Transactional@Listen- public void on(ProjectDeleted event) {- Long projectId = event.getProject().getId();- dao.doAfterCommit(new Runnable() {+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Project) {+ Long projectId = event.getEntity().getId();+ dao.doAfterCommit(new Runnable() {- @Override- public void run() {- synchronized (searcherManagers) {- SearcherManager searcherManager = searcherManagers.get(projectId);- if (searcherManager != null) {- try {- searcherManager.close();- } catch (IOException e) {- Throwables.propagate(e);+ @Override+ public void run() {+ synchronized (searcherManagers) {+ SearcherManager searcherManager = searcherManagers.get(projectId);+ if (searcherManager != null) {+ try {+ searcherManager.close();+ } catch (IOException e) {+ Throwables.propagate(e);+ }+ searcherManagers.remove(projectId);}- searcherManagers.remove(projectId);}}- }-- });++ });+ }}@Listendiff --git a/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java b/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.javaindex e9791af6a2..d3f5b9b12c 100644--- a/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java+++ b/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java@@ -32,7 +32,7 @@ public class Avatar extends WebComponent {} else {userId = user.getId();}- url = avatarManager.getAvatarUrl(user);+ url = avatarManager.getAvatarUrl(user.getFacade());}public Avatar(String id, PersonIdent person) {@@ -43,7 +43,7 @@ public class Avatar extends WebComponent {User user = GitPlex.getInstance(UserManager.class).find(person);if (user != null) {userId = user.getId();- url = avatarManager.getAvatarUrl(user);+ url = avatarManager.getAvatarUrl(user.getFacade());} else {userId = null;url = avatarManager.getAvatarUrl(person);@@ -58,7 +58,7 @@ public class Avatar extends WebComponent {AvatarChanged avatarChanged = (AvatarChanged) event.getPayload();if (avatarChanged.getUser().getId().equals(userId)) {AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- url = avatarManager.getAvatarUrl(avatarChanged.getUser());+ url = avatarManager.getAvatarUrl(avatarChanged.getUser().getFacade());avatarChanged.getHandler().add(this);}}diff --git a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.javaindex 2f29116a10..2bafe2b4a0 100644--- a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java@@ -59,7 +59,7 @@ public class AvatarLink extends ViewStateAwarePageLink<Void> {} else {tooltip = null;}- url = avatarManager.getAvatarUrl(user);+ url = avatarManager.getAvatarUrl(user.getFacade());}public AvatarLink(String id, PersonIdent person) {@@ -75,7 +75,7 @@ public class AvatarLink extends ViewStateAwarePageLink<Void> {if (user != null) {userId = user.getId();params = UserPage.paramsOf(user);- url = avatarManager.getAvatarUrl(user);+ url = avatarManager.getAvatarUrl(user.getFacade());} else {userId = null;params = new PageParameters();@@ -106,7 +106,7 @@ public class AvatarLink extends ViewStateAwarePageLink<Void> {AvatarChanged avatarChanged = (AvatarChanged) event.getPayload();if (avatarChanged.getUser().getId().equals(userId)) {AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- url = avatarManager.getAvatarUrl(avatarChanged.getUser());+ url = avatarManager.getAvatarUrl(avatarChanged.getUser().getFacade());avatarChanged.getHandler().add(this);}}diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java b/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.javaindex e62697aef3..eb3709d42b 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java@@ -10,14 +10,16 @@ import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;-import com.gitplex.server.model.User;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.User;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.StringUtils;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.web.component.markdown.MarkdownEditor;import com.gitplex.server.web.component.markdown.PullRequestReferenceSupport;import com.gitplex.server.web.component.markdown.UserMentionSupport;@@ -36,17 +38,17 @@ public abstract class CommentInput extends MarkdownEditor {@Overridepublic List<User> findUsers(String query, int count) {List<User> users = new ArrayList<>();- for (User user: SecurityUtils.findUsersCan(getProject(), ProjectPrivilege.READ)) {+ UserManager userManager = GitPlex.getInstance(UserManager.class);+ for (UserFacade user:+ SecurityUtils.getAuthorizedUsers(getProject().getFacade(), ProjectPrivilege.READ)) {if (users.size() < count) {- if (StringUtils.deleteWhitespace(user.getName()).toLowerCase().contains(query)- || user.getFullName() != null && StringUtils.deleteWhitespace(user.getFullName()).toLowerCase().contains(query)) {- users.add(user);- }+ if (user.matchesQuery(query))+ users.add(userManager.load(user.getId()));} else {break;}}- users.sort(Comparator.comparing(User::getName));+ users.sort(Comparator.comparing(User::getDisplayName));return users;}diff --git a/web/src/main/java/com/gitplex/server/web/component/contributorpanel/contributor.css b/web/src/main/java/com/gitplex/server/web/component/contributorpanel/contributor.cssindex edf67b044f..0311ac7f77 100644--- a/web/src/main/java/com/gitplex/server/web/component/contributorpanel/contributor.css+++ b/web/src/main/java/com/gitplex/server/web/component/contributorpanel/contributor.css@@ -1,6 +1,6 @@.contributor {- color: #999;+ color: #888;}-.contributor .name {+.contributor a {color: #666;}diff --git a/web/src/main/java/com/gitplex/server/web/component/groupchoice/AbstractGroupChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/groupchoice/AbstractGroupChoiceProvider.javaindex 5697ce7568..ee02f84f0c 100644--- a/web/src/main/java/com/gitplex/server/web/component/groupchoice/AbstractGroupChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/groupchoice/AbstractGroupChoiceProvider.java@@ -6,28 +6,28 @@ import java.util.List;import org.json.JSONException;import org.json.JSONWriter;-import com.google.common.collect.Lists;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.GroupManager;-import com.gitplex.server.model.Group;+import com.gitplex.server.manager.CacheManager;+import com.gitplex.server.util.facade.GroupFacade;import com.gitplex.server.web.component.select2.ChoiceProvider;+import com.google.common.collect.Lists;-public abstract class AbstractGroupChoiceProvider extends ChoiceProvider<Group> {+public abstract class AbstractGroupChoiceProvider extends ChoiceProvider<GroupFacade> {private static final long serialVersionUID = 1L;@Override- public void toJson(Group choice, JSONWriter writer) throws JSONException {+ public void toJson(GroupFacade choice, JSONWriter writer) throws JSONException {writer.key("id").value(choice.getId()).key("name").value(choice.getName());}@Override- public Collection<Group> toChoices(Collection<String> ids) {- List<Group> groups = Lists.newArrayList();- GroupManager groupManager = GitPlex.getInstance(GroupManager.class);+ public Collection<GroupFacade> toChoices(Collection<String> ids) {+ List<GroupFacade> groups = Lists.newArrayList();+ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);for (String each : ids) {Long id = Long.valueOf(each);- groups.add(groupManager.load(id));+ groups.add(cacheManager.getGroup(id));}return groups;diff --git a/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceProvider.javaindex 3ac030b19a..d3464bc694 100644--- a/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupChoiceProvider.java@@ -1,35 +1,34 @@package com.gitplex.server.web.component.groupchoice;+import java.util.ArrayList;+import java.util.Comparator;+import java.util.Iterator;import java.util.List;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Restrictions;-import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.GroupManager;-import com.gitplex.server.model.Group;-import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.manager.CacheManager;+import com.gitplex.server.util.facade.GroupFacade;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.select2.Response;+import com.gitplex.server.web.component.select2.ResponseFiller;public class GroupChoiceProvider extends AbstractGroupChoiceProvider {private static final long serialVersionUID = 1L;@Override- public void query(String term, int page, Response<Group> response) {- GroupManager groupManager = GitPlex.getInstance(GroupManager.class);- int first = page * WebConstants.PAGE_SIZE;- EntityCriteria<Group> criteria = groupManager.newCriteria();- criteria.add(Restrictions.ilike("name", term, MatchMode.ANYWHERE));- List<Group> groups = groupManager.findRange(criteria, first, WebConstants.PAGE_SIZE + 1);-- if (groups.size() <= WebConstants.PAGE_SIZE) {- response.addAll(groups);- } else {- response.addAll(groups.subList(0, WebConstants.PAGE_SIZE));- response.setHasMore(true);+ public void query(String term, int page, Response<GroupFacade> response) {+ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);+ List<GroupFacade> choices = new ArrayList<GroupFacade>(cacheManager.getGroups().values());++ for (Iterator<GroupFacade> it = choices.iterator(); it.hasNext();) {+ GroupFacade group = it.next();+ if (!group.matchesQuery(term))+ it.remove();}+ choices.sort(Comparator.comparing(GroupFacade::getName));++ new ResponseFiller<GroupFacade>(response).fill(choices, page, WebConstants.PAGE_SIZE);}}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupMultiChoice.java b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupMultiChoice.javaindex d262d11e8f..d0504db9ce 100644--- a/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupMultiChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupMultiChoice.java@@ -6,13 +6,13 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.model.Group;+import com.gitplex.server.util.facade.GroupFacade;import com.gitplex.server.web.component.select2.Select2MultiChoice;@SuppressWarnings("serial")-public class GroupMultiChoice extends Select2MultiChoice<Group> {+public class GroupMultiChoice extends Select2MultiChoice<GroupFacade> {- public GroupMultiChoice(String id, IModel<Collection<Group>> groupsModel,+ public GroupMultiChoice(String id, IModel<Collection<GroupFacade>> groupsModel,AbstractGroupChoiceProvider choiceProvider) {super(id, groupsModel, choiceProvider);}diff --git a/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupSingleChoice.java b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupSingleChoice.javaindex f6656bcf04..603188e8d4 100644--- a/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupSingleChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/groupchoice/GroupSingleChoice.java@@ -4,13 +4,13 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.model.Group;+import com.gitplex.server.util.facade.GroupFacade;import com.gitplex.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")-public class GroupSingleChoice extends Select2Choice<Group> {+public class GroupSingleChoice extends Select2Choice<GroupFacade> {- public GroupSingleChoice(String id, IModel<Group> groupModel,+ public GroupSingleChoice(String id, IModel<GroupFacade> groupModel,AbstractGroupChoiceProvider choiceProvider) {super(id, groupModel, choiceProvider);}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.javaindex a4159b09dd..6719892c46 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java@@ -254,11 +254,14 @@ public class MarkdownEditor extends FormComponentPanel<String> {userMap.put("name", user.getName());if (user.getFullName() != null)userMap.put("fullName", user.getFullName());- if (user.getNoSpaceFullName() != null)- userMap.put("searchKey", user.getNoSpaceName() + " " + user.getNoSpaceFullName());- else- userMap.put("searchKey", user.getNoSpaceName());- String avatarUrl = avatarManager.getAvatarUrl(user);+ String noSpaceName = StringUtils.deleteWhitespace(user.getName());+ if (user.getFullName() != null) {+ String noSpaceFullName = StringUtils.deleteWhitespace(user.getFullName());+ userMap.put("searchKey", noSpaceName + " " + noSpaceFullName);+ } else {+ userMap.put("searchKey", noSpaceName);+ }+ String avatarUrl = avatarManager.getAvatarUrl(user.getFacade());userMap.put("avatarUrl", avatarUrl);userList.add(userMap);}diff --git a/web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoice.java b/web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoice.javaindex 872ed0653a..853ac86126 100644--- a/web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoice.java@@ -4,13 +4,13 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.model.Project;+import com.gitplex.server.util.facade.ProjectFacade;import com.gitplex.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")-public class AbstractProjectChoice extends Select2Choice<Project> {+public class AbstractProjectChoice extends Select2Choice<ProjectFacade> {- public AbstractProjectChoice(String id, IModel<Project> projectModel,+ public AbstractProjectChoice(String id, IModel<ProjectFacade> projectModel,AbstractProjectChoiceProvider choiceProvider) {super(id, projectModel, choiceProvider);}diff --git a/web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoiceProvider.javaindex be211ad93f..4aa3012fdc 100644--- a/web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoiceProvider.java@@ -7,29 +7,29 @@ import org.apache.commons.lang3.StringEscapeUtils;import org.json.JSONException;import org.json.JSONWriter;-import com.google.common.collect.Lists;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.ProjectManager;-import com.gitplex.server.model.Project;+import com.gitplex.server.manager.CacheManager;+import com.gitplex.server.util.facade.ProjectFacade;import com.gitplex.server.web.component.select2.ChoiceProvider;+import com.google.common.collect.Lists;@SuppressWarnings("serial")-public abstract class AbstractProjectChoiceProvider extends ChoiceProvider<Project> {+public abstract class AbstractProjectChoiceProvider extends ChoiceProvider<ProjectFacade> {@Override- public void toJson(Project choice, JSONWriter writer) throws JSONException {+ public void toJson(ProjectFacade choice, JSONWriter writer) throws JSONException {writer.key("id").value(choice.getId());writer.key("name");writer.value(StringEscapeUtils.escapeHtml4(choice.getName()));}@Override- public Collection<Project> toChoices(Collection<String> ids) {- List<Project> list = Lists.newArrayList();- ProjectManager projectManager = GitPlex.getInstance(ProjectManager.class);+ public Collection<ProjectFacade> toChoices(Collection<String> ids) {+ List<ProjectFacade> list = Lists.newArrayList();+ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);for (String each : ids) {Long id = Long.valueOf(each);- list.add(projectManager.load(id));+ list.add(cacheManager.getProject(id));}return list;diff --git a/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.java b/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.javaindex 171033797c..a003c5f6fb 100644--- a/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.java+++ b/web/src/main/java/com/gitplex/server/web/component/projectselector/ProjectSelector.java@@ -2,6 +2,7 @@ package com.gitplex.server.web.component.projectselector;import java.util.ArrayList;import java.util.Collection;+import java.util.Comparator;import java.util.List;import org.apache.wicket.Component;@@ -120,11 +121,11 @@ public abstract class ProjectSelector extends Panel {protected List<Project> load() {List<Project> projects = new ArrayList<>();for (Project project: projectsModel.getObject()) {- if (project.matches(searchInput)) {+ if (project.matchesQuery(searchInput)) {projects.add(project);}}- projects.sort(Project::compareLastVisit);+ projects.sort(Comparator.comparing(Project::getName));return projects;}diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.javaindex 75076cde52..0ec6228a84 100644--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerChoice.java@@ -9,14 +9,15 @@ import org.apache.wicket.model.IModel;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.ReviewInvitationManager;-import com.gitplex.server.model.User;+import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.ReviewInvitation;-import com.gitplex.server.web.component.userchoice.UserChoiceResourceReference;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.web.component.select2.SelectToAddChoice;+import com.gitplex.server.web.component.userchoice.UserChoiceResourceReference;@SuppressWarnings("serial")-public abstract class ReviewerChoice extends SelectToAddChoice<User> {+public abstract class ReviewerChoice extends SelectToAddChoice<UserFacade> {private final IModel<PullRequest> requestModel;@@ -51,7 +52,7 @@ public abstract class ReviewerChoice extends SelectToAddChoice<User> {}@Override- protected void onSelect(AjaxRequestTarget target, User user) {+ protected void onSelect(AjaxRequestTarget target, UserFacade user) {PullRequest request = requestModel.getObject();ReviewInvitation invitation = null;for(ReviewInvitation each: request.getReviewInvitations()) {@@ -63,7 +64,7 @@ public abstract class ReviewerChoice extends SelectToAddChoice<User> {if (invitation == null) {invitation = new ReviewInvitation();invitation.setRequest(request);- invitation.setUser(user);+ invitation.setUser(GitPlex.getInstance(UserManager.class).load(user.getId()));request.getReviewInvitations().add(invitation);}invitation.setType(ReviewInvitation.Type.MANUAL);diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.javaindex b113e64e75..c2e828298b 100644--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java@@ -32,6 +32,7 @@ import com.gitplex.server.model.Review;import com.gitplex.server.model.ReviewInvitation;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.ReviewStatus;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.web.behavior.dropdown.DropdownHover;import com.gitplex.server.web.component.avatar.AvatarLink;import com.gitplex.server.web.component.link.UserLink;@@ -241,7 +242,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {}@Override- protected void onSelect(AjaxRequestTarget target, User user) {+ protected void onSelect(AjaxRequestTarget target, UserFacade user) {super.onSelect(target, user);send(getPage(), Broadcast.BREADTH, new PageDataChanged(target));}diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.javaindex 306feecdfd..4896f54b2e 100644--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerProvider.java@@ -1,15 +1,22 @@package com.gitplex.server.web.component.requestreviewer;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Comparator;import java.util.Iterator;import java.util.List;import org.apache.wicket.model.IModel;-import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.User;+import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.util.ReviewStatus;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.web.WebConstants;-import com.gitplex.server.web.component.userchoice.AbstractUserChoiceProvider;import com.gitplex.server.web.component.select2.Response;+import com.gitplex.server.web.component.userchoice.AbstractUserChoiceProvider;public class ReviewerProvider extends AbstractUserChoiceProvider {@@ -22,16 +29,25 @@ public class ReviewerProvider extends AbstractUserChoiceProvider {}@Override- public void query(String term, int page, Response<User> response) {- List<User> reviewers = requestModel.getObject().getRemainingReviewers();+ public void query(String term, int page, Response<UserFacade> response) {+ PullRequest request = requestModel.getObject();+ ReviewStatus checkStatus = request.getReviewStatus();+ Collection<UserFacade> users = SecurityUtils.getAuthorizedUsers(request.getTargetProject().getFacade(),+ ProjectPrivilege.READ);+ for (User reviewer: checkStatus.getAwaitingReviewers())+ users.remove(reviewer.getFacade());+ for (User reviewer: checkStatus.getEffectiveReviews().keySet())+ users.remove(reviewer.getFacade());+ users.remove(SecurityUtils.getUser().getFacade());++ List<UserFacade> reviewers = new ArrayList<>(users);- for (Iterator<User> it = reviewers.iterator(); it.hasNext();) {- User user = it.next();- if (!user.matches(term))+ for (Iterator<UserFacade> it = reviewers.iterator(); it.hasNext();) {+ UserFacade user = it.next();+ if (!user.matchesQuery(term))it.remove();}-- reviewers.sort((user1, user2) -> user1.getDisplayName().compareTo(user2.getDisplayName()));+ reviewers.sort(Comparator.comparing(UserFacade::getDisplayName));int first = page * WebConstants.PAGE_SIZE;int last = first + WebConstants.PAGE_SIZE;diff --git a/web/src/main/java/com/gitplex/server/web/component/userchoice/AbstractUserChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/userchoice/AbstractUserChoiceProvider.javaindex f89251dd4c..1a22953c86 100644--- a/web/src/main/java/com/gitplex/server/web/component/userchoice/AbstractUserChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/userchoice/AbstractUserChoiceProvider.java@@ -7,31 +7,31 @@ import org.apache.commons.lang3.StringEscapeUtils;import org.json.JSONException;import org.json.JSONWriter;-import com.google.common.collect.Lists;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.UserManager;-import com.gitplex.server.model.User;+import com.gitplex.server.manager.CacheManager;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.web.component.select2.ChoiceProvider;import com.gitplex.server.web.util.avatar.AvatarManager;+import com.google.common.collect.Lists;-public abstract class AbstractUserChoiceProvider extends ChoiceProvider<User> {+public abstract class AbstractUserChoiceProvider extends ChoiceProvider<UserFacade> {private static final long serialVersionUID = 1L;@Override- public void toJson(User choice, JSONWriter writer) throws JSONException {+ public void toJson(UserFacade choice, JSONWriter writer) throws JSONException {writer.key("id").value(choice.getId()).key("name").value(StringEscapeUtils.escapeHtml4(choice.getDisplayName()));String avatarUrl = GitPlex.getInstance(AvatarManager.class).getAvatarUrl(choice);writer.key("avatar").value(avatarUrl);}@Override- public Collection<User> toChoices(Collection<String> ids) {- List<User> users = Lists.newArrayList();- UserManager userManager = GitPlex.getInstance(UserManager.class);+ public Collection<UserFacade> toChoices(Collection<String> ids) {+ List<UserFacade> users = Lists.newArrayList();+ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);for (String each : ids) {Long id = Long.valueOf(each);- users.add(userManager.load(id));+ users.add(cacheManager.getUser(id));}return users;diff --git a/web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceProvider.java b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceProvider.javaindex 5903fdbe23..77262a953e 100644--- a/web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceProvider.java+++ b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserChoiceProvider.java@@ -2,21 +2,16 @@ package com.gitplex.server.web.component.userchoice;import java.util.ArrayList;import java.util.Comparator;+import java.util.Iterator;import java.util.List;-import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;-import com.gitplex.server.GitPlex;-import com.gitplex.server.model.User;-import com.gitplex.server.model.Project;-import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.persistence.dao.EntityCriteria;+import com.gitplex.server.manager.CacheManager;import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.editable.annotation.UserChoice;+import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.select2.Response;import com.gitplex.server.web.component.select2.ResponseFiller;@@ -34,38 +29,29 @@ public class UserChoiceProvider extends AbstractUserChoiceProvider {}@Override- public void query(String term, int page, Response<User> response) {- if (type == UserChoice.Type.ALL) {- Dao dao = GitPlex.getInstance(Dao.class);- int first = page * WebConstants.PAGE_SIZE;- Criterion criterion = Restrictions.and(Restrictions.or(- Restrictions.ilike("name", term, MatchMode.ANYWHERE),- Restrictions.ilike("fullName", term, MatchMode.ANYWHERE)));- EntityCriteria<User> criteria = EntityCriteria.of(User.class);- criteria.add(criterion);- criteria.addOrder(Order.asc("name"));- List<User> users = dao.findRange(criteria, first, WebConstants.PAGE_SIZE + 1);-- if (users.size() <= WebConstants.PAGE_SIZE) {- response.addAll(users);- } else {- response.addAll(users.subList(0, WebConstants.PAGE_SIZE));- response.setHasMore(true);- }+ public void query(String term, int page, Response<UserFacade> response) {+ List<UserFacade> choices;+ if (type == UserChoice.Type.PROJECT_READER) {+ ProjectFacade project = (((ProjectPage) WicketUtils.getPage()).getProject()).getFacade();+ choices = new ArrayList<UserFacade>(SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.READ));+ } else if (type == UserChoice.Type.PROJECT_WRITER) {+ ProjectFacade project = (((ProjectPage) WicketUtils.getPage()).getProject()).getFacade();+ choices = new ArrayList<UserFacade>(SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.WRITE));+ } else if (type == UserChoice.Type.PROJECT_ADMINISTRATOR) {+ ProjectFacade project = (((ProjectPage) WicketUtils.getPage()).getProject()).getFacade();+ choices = new ArrayList<UserFacade>(SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.ADMIN));} else {- Project project = ((ProjectPage) WicketUtils.getPage()).getProject();- List<User> choices;- if (type == UserChoice.Type.DEPOT_READER)- choices = new ArrayList<User>(SecurityUtils.findUsersCan(project, ProjectPrivilege.READ));- else if (type == UserChoice.Type.DEPOT_WRITER)- choices = new ArrayList<User>(SecurityUtils.findUsersCan(project, ProjectPrivilege.WRITE));- else- choices = new ArrayList<User>(SecurityUtils.findUsersCan(project, ProjectPrivilege.ADMIN));-- choices.sort(Comparator.comparing(User::getName));+ choices = new ArrayList<UserFacade>(GitPlex.getInstance(CacheManager.class).getUsers().values());+ }- new ResponseFiller<User>(response).fill(choices, page, WebConstants.PAGE_SIZE);+ for (Iterator<UserFacade> it = choices.iterator(); it.hasNext();) {+ UserFacade user = it.next();+ if (!user.matchesQuery(term))+ it.remove();}+ choices.sort(Comparator.comparing(UserFacade::getName));++ new ResponseFiller<UserFacade>(response).fill(choices, page, WebConstants.PAGE_SIZE);}}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/userchoice/UserMultiChoice.java b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserMultiChoice.javaindex 5f1ec67bff..72d456bc82 100644--- a/web/src/main/java/com/gitplex/server/web/component/userchoice/UserMultiChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserMultiChoice.java@@ -6,16 +6,14 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.model.User;-import com.gitplex.server.web.component.userchoice.UserChoiceResourceReference;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.web.component.select2.Select2MultiChoice;-public class UserMultiChoice extends Select2MultiChoice<User> {+public class UserMultiChoice extends Select2MultiChoice<UserFacade> {private static final long serialVersionUID = 1L;- public UserMultiChoice(String id, IModel<Collection<User>> model,- AbstractUserChoiceProvider choiceProvider) {+ public UserMultiChoice(String id, IModel<Collection<UserFacade>> model, AbstractUserChoiceProvider choiceProvider) {super(id, model, choiceProvider);}diff --git a/web/src/main/java/com/gitplex/server/web/component/userchoice/UserSingleChoice.java b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserSingleChoice.javaindex 3537e76836..f2b0f6fcf6 100644--- a/web/src/main/java/com/gitplex/server/web/component/userchoice/UserSingleChoice.java+++ b/web/src/main/java/com/gitplex/server/web/component/userchoice/UserSingleChoice.java@@ -4,14 +4,13 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;-import com.gitplex.server.model.User;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.web.component.select2.Select2Choice;@SuppressWarnings("serial")-public class UserSingleChoice extends Select2Choice<User> {+public class UserSingleChoice extends Select2Choice<UserFacade> {- public UserSingleChoice(String id, IModel<User> model,- AbstractUserChoiceProvider choiceProvider) {+ public UserSingleChoice(String id, IModel<UserFacade> model, AbstractUserChoiceProvider choiceProvider) {super(id, model, choiceProvider);}diff --git a/web/src/main/java/com/gitplex/server/web/component/userchoice/user-choice.css b/web/src/main/java/com/gitplex/server/web/component/userchoice/user-choice.cssindex 57a57934a0..653dbed885 100644--- a/web/src/main/java/com/gitplex/server/web/component/userchoice/user-choice.css+++ b/web/src/main/java/com/gitplex/server/web/component/userchoice/user-choice.css@@ -1,13 +1,3 @@-.select2-container img.avatar {- margin-right: 6px;- margin-top: -2px;-}-.select2-container .user-name, .select2-container .user-fullname {- font-style: normal;-}-.select2-results .user {- clear: both;-}.select2-results .user .avatar {height: 24px;width: 24px;diff --git a/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupMultiChoiceEditor.javaindex 1e9a402320..0bdf040174 100644--- a/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -12,6 +12,7 @@ import org.apache.wicket.util.convert.ConversionException;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.GroupManager;import com.gitplex.server.model.Group;+import com.gitplex.server.util.facade.GroupFacade;import com.gitplex.server.web.component.groupchoice.GroupChoiceProvider;import com.gitplex.server.web.component.groupchoice.GroupMultiChoice;import com.gitplex.server.web.editable.ErrorContext;@@ -33,13 +34,13 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {protected void onInitialize() {super.onInitialize();- List<Group> groups = new ArrayList<>();+ List<GroupFacade> groups = new ArrayList<>();if (getModelObject() != null) {GroupManager groupManager = GitPlex.getInstance(GroupManager.class);for (String groupName: getModelObject()) {Group group = groupManager.find(groupName);if (group != null)- groups.add(group);+ groups.add(group.getFacade());}}@@ -57,9 +58,9 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {@Overrideprotected List<String> convertInputToValue() throws ConversionException {List<String> groupNames = new ArrayList<>();- Collection<Group> groups = input.getConvertedInput();+ Collection<GroupFacade> groups = input.getConvertedInput();if (groups != null) {- for (Group group: groups)+ for (GroupFacade group: groups)groupNames.add(group.getName());}return groupNames;diff --git a/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupSingleChoiceEditor.javaindex f314f26e71..55a4a803e6 100644--- a/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -6,7 +6,7 @@ import org.apache.wicket.util.convert.ConversionException;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.GroupManager;-import com.gitplex.server.model.Group;+import com.gitplex.server.util.facade.GroupFacade;import com.gitplex.server.web.component.groupchoice.GroupChoiceProvider;import com.gitplex.server.web.component.groupchoice.GroupSingleChoice;import com.gitplex.server.web.editable.ErrorContext;@@ -27,9 +27,9 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- Group group;+ GroupFacade group;if (getModelObject() != null)- group = GitPlex.getInstance(GroupManager.class).find(getModelObject());+ group = GitPlex.getInstance(GroupManager.class).find(getModelObject()).getFacade();elsegroup = null;@@ -49,7 +49,7 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected String convertInputToValue() throws ConversionException {- Group group = input.getConvertedInput();+ GroupFacade group = input.getConvertedInput();if (group != null)return group.getName();elsediff --git a/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserMultiChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex 46c82166d3..050b70e252 100644--- a/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -13,6 +13,7 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.User;import com.gitplex.server.util.editable.annotation.UserChoice;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.web.component.userchoice.UserChoiceProvider;import com.gitplex.server.web.component.userchoice.UserMultiChoice;import com.gitplex.server.web.editable.ErrorContext;@@ -38,13 +39,13 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {protected void onInitialize() {super.onInitialize();- List<User> users = new ArrayList<>();+ List<UserFacade> users = new ArrayList<>();if (getModelObject() != null) {UserManager userManager = GitPlex.getInstance(UserManager.class);for (String userName: getModelObject()) {User user = userManager.findByName(userName);if (user != null)- users.add(user);+ users.add(user.getFacade());}}@@ -62,9 +63,9 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {@Overrideprotected List<String> convertInputToValue() throws ConversionException {List<String> userNames = new ArrayList<>();- Collection<User> users = input.getConvertedInput();+ Collection<UserFacade> users = input.getConvertedInput();if (users != null) {- for (User user: users)+ for (UserFacade user: users)userNames.add(user.getName());}return userNames;diff --git a/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserSingleChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex 07292eedde..7a44f81259 100644--- a/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserSingleChoiceEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -8,6 +8,7 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.User;import com.gitplex.server.util.editable.annotation.UserChoice;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.web.component.userchoice.UserChoiceProvider;import com.gitplex.server.web.component.userchoice.UserSingleChoice;import com.gitplex.server.web.editable.ErrorContext;@@ -38,7 +39,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {elseuser = null;- input = new UserSingleChoice("input", Model.of(user), new UserChoiceProvider(type));+ input = new UserSingleChoice("input", Model.of(user.getFacade()), new UserChoiceProvider(type));input.setConvertEmptyInputStringToNull(true);// add this to control allowClear flag of select2@@ -54,7 +55,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {@Overrideprotected String convertInputToValue() throws ConversionException {- User user = input.getConvertedInput();+ UserFacade user = input.getConvertedInput();if (user != null)return user.getName();elsediff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.javaindex c20476ae7f..04cf35250f 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java@@ -8,6 +8,7 @@ import java.util.Iterator;import java.util.List;import org.apache.wicket.Component;+import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;@@ -33,12 +34,14 @@ import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.GroupAuthorizationManager;import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.model.GroupAuthorization;-import com.gitplex.server.model.Project;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.util.facade.GroupAuthorizationFacade;+import com.gitplex.server.util.facade.ProjectFacade;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.datatable.DefaultDataTable;@@ -91,18 +94,24 @@ public class GroupAuthorizationsPage extends GroupPage {});- add(new SelectToAddChoice<Project>("addNew", new AbstractProjectChoiceProvider() {+ add(new SelectToAddChoice<ProjectFacade>("addNew", new AbstractProjectChoiceProvider() {@Override- public void query(String term, int page, Response<Project> response) {- List<Project> notAuthorized = new ArrayList<>();- for (Project project: GitPlex.getInstance(ProjectManager.class).findAll()) {- if (project.matches(searchInput) && !getGroup().getAuthorizedProjects().contains(project))- notAuthorized.add(project);+ public void query(String term, int page, Response<ProjectFacade> response) {+ List<ProjectFacade> notAuthorizedProjects = new ArrayList<>();+ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);+ Collection<Long> authorizedProjectIds = new HashSet<>();+ for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {+ if (authorization.getGroupId().equals(getGroup().getId()))+ authorizedProjectIds.add(authorization.getProjectId());}- Collections.sort(notAuthorized);- Collections.reverse(notAuthorized);- new ResponseFiller<Project>(response).fill(notAuthorized, page, WebConstants.PAGE_SIZE);+ for (ProjectFacade project: cacheManager.getProjects().values()) {+ if (project.matchesQuery(term) && !authorizedProjectIds.contains(project.getId()))+ notAuthorizedProjects.add(project);+ }+ Collections.sort(notAuthorizedProjects);+ Collections.reverse(notAuthorizedProjects);+ new ResponseFiller<ProjectFacade>(response).fill(notAuthorizedProjects, page, WebConstants.PAGE_SIZE);}}) {@@ -118,12 +127,13 @@ public class GroupAuthorizationsPage extends GroupPage {}@Override- protected void onSelect(AjaxRequestTarget target, Project selection) {+ protected void onSelect(AjaxRequestTarget target, ProjectFacade selection) {GroupAuthorization authorization = new GroupAuthorization();authorization.setGroup(getGroup());- authorization.setProject(selection);+ authorization.setProject(GitPlex.getInstance(ProjectManager.class).load(selection.getId()));GitPlex.getInstance(GroupAuthorizationManager.class).save(authorization);target.add(authorizationsTable);+ Session.get().success("Project added");}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.html b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.htmlindex e6a6c26f62..56494e2a80 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.html@@ -1,5 +1,5 @@<wicket:extend>- <div class="user list">+ <div class="membership list"><div class="head clearfix"><div class="pull-left"><input wicket:id="filterUsers" class="form-control search" placeholder="Filter by user name"></input>diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.javaindex 75ec6b4810..a8e888a60d 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java@@ -6,7 +6,9 @@ import java.util.Collections;import java.util.HashSet;import java.util.Iterator;import java.util.List;+import java.util.Set;+import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;@@ -29,12 +31,14 @@ import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.MembershipManager;import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.Membership;-import com.gitplex.server.model.User;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.util.facade.MembershipFacade;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.avatar.AvatarLink;@@ -85,18 +89,24 @@ public class GroupMembershipsPage extends GroupPage {});- add(new SelectToAddChoice<User>("addNew", new AbstractUserChoiceProvider() {+ add(new SelectToAddChoice<UserFacade>("addNew", new AbstractUserChoiceProvider() {@Override- public void query(String term, int page, Response<User> response) {- List<User> nonMembers = new ArrayList<>();- for (User user: GitPlex.getInstance(UserManager.class).findAll()) {- if (user.matches(searchInput) && !getGroup().getMembers().contains(user))+ public void query(String term, int page, Response<UserFacade> response) {+ List<UserFacade> nonMembers = new ArrayList<>();+ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);+ Set<Long> memberIds = new HashSet<>();+ for (MembershipFacade membership: cacheManager.getMemberships().values()) {+ if (membership.getGroupId().equals(getGroup().getId()))+ memberIds.add(membership.getUserId());+ }+ for (UserFacade user: cacheManager.getUsers().values()) {+ if (user.matchesQuery(term) && !memberIds.contains(user.getId()))nonMembers.add(user);}Collections.sort(nonMembers);Collections.reverse(nonMembers);- new ResponseFiller<User>(response).fill(nonMembers, page, WebConstants.PAGE_SIZE);+ new ResponseFiller<>(response).fill(nonMembers, page, WebConstants.PAGE_SIZE);}}) {@@ -112,12 +122,13 @@ public class GroupMembershipsPage extends GroupPage {}@Override- protected void onSelect(AjaxRequestTarget target, User selection) {+ protected void onSelect(AjaxRequestTarget target, UserFacade selection) {Membership membership = new Membership();membership.setGroup(getGroup());- membership.setUser(selection);+ membership.setUser(GitPlex.getInstance(UserManager.class).load(selection.getId()));GitPlex.getInstance(MembershipManager.class).save(membership);target.add(membershipsTable);+ Session.get().success("Member added");}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/group/group.css b/web/src/main/java/com/gitplex/server/web/page/group/group.cssindex ee44fe3dbc..33abfe3f04 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/group.css+++ b/web/src/main/java/com/gitplex/server/web/page/group/group.css@@ -4,3 +4,7 @@#group.sidebar>table>tbody>tr>td.content {padding: 20px;}+#group .authorization.list .head .select2-container,+#group .membership.list .head .select2-container {+ width: 240px;+}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.htmlindex b3a45ec99e..06174f3adb 100644--- a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html@@ -9,13 +9,16 @@</div></div><div class="body">- <ul wicket:id="projects" class="list-unstyled">- <li wicket:id="projects">- <a wicket:id="link"><i class="fa fa-ext fa-repo"></i> <span wicket:id="name"></span></a>- </li>- </ul>- <div class="center"><ul wicket:id="projectsPageNav"></ul></div>- <div wicket:id="noProjects" class="alert alert-warning">No projects found</div>+ <table wicket:id="projects" class="projects table"></table></div></div>+ <wicket:fragment wicket:id="projectFrag">+ <i class="fa fa-ext fa-repo"></i> <a wicket:id="link"><span wicket:id="name"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="authorFrag">+ <a wicket:id="avatar"></a> <a wicket:id="name"></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="commitMessageFrag">+ <a wicket:id="link"><span wicket:id="message"></span></a>+ </wicket:fragment></wicket:extend>diff --git a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.javaindex 601534a830..06acf5b5b7 100644--- a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java@@ -1,46 +1,105 @@package com.gitplex.server.web.page.home;import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.Iterator;import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;+import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.revwalk.RevCommit;import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.model.Project;+import com.gitplex.server.model.User;import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.util.facade.GroupAuthorizationFacade;+import com.gitplex.server.util.facade.MembershipFacade;+import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.util.facade.UserAuthorizationFacade;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;+import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.layout.LayoutPage;import com.gitplex.server.web.page.layout.NewProjectPage;import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;+import com.gitplex.server.web.util.DateUtils;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;@SuppressWarnings("serial")public class DashboardPage extends LayoutPage {- private PageableListView<Project> projectsView;-- private BootstrapPagingNavigator projectsPageNav;-- private WebMarkupContainer projectsContainer;+ private final IModel<List<ProjectFacade>> projectsModel = new LoadableDetachableModel<List<ProjectFacade>>() {++ @Override+ protected List<ProjectFacade> load() {+ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);+ List<ProjectFacade> projects = new ArrayList<>();++ if (SecurityUtils.isAdministrator()) {+ projects.addAll(cacheManager.getProjects().values());+ } else {+ for (ProjectFacade project: cacheManager.getProjects().values()) {+ if (project.isPublicRead())+ projects.add(project);+ }+ User user = getLoginUser();+ if (user != null) {+ Collection<Long> groupIds = new HashSet<>();+ for (MembershipFacade membership: cacheManager.getMemberships().values()) {+ if (membership.getUserId().equals(user.getId()))+ groupIds.add(membership.getGroupId());+ }+ for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {+ if (groupIds.contains(authorization.getGroupId()))+ projects.add(cacheManager.getProject(authorization.getProjectId()));+ }+ for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {+ if (authorization.getUserId().equals(user.getId()))+ projects.add(cacheManager.getProject(authorization.getProjectId()));+ }+ }+ }++ for (Iterator<ProjectFacade> it = projects.iterator(); it.hasNext();) {+ if (!it.next().matchesQuery(searchInput))+ it.remove();+ }+ projects.sort(ProjectFacade::compareLastVisit);+ return projects;+ }++ };- private WebMarkupContainer noProjectsContainer;+ private DataTable<ProjectFacade, Void> projectsTable;private String searchInput;@@ -55,9 +114,7 @@ public class DashboardPage extends LayoutPage {@Overrideprotected void onTypingDone(AjaxRequestTarget target) {searchInput = searchField.getInput();- target.add(projectsContainer);- target.add(projectsPageNav);- target.add(noProjectsContainer);+ target.add(projectsTable);}});@@ -71,68 +128,120 @@ public class DashboardPage extends LayoutPage {});- projectsContainer = new WebMarkupContainer("projects") {+ List<IColumn<ProjectFacade, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Project")) {@Override- protected void onConfigure() {- super.onConfigure();- setVisible(!projectsView.getModelObject().isEmpty());+ public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,+ IModel<ProjectFacade> rowModel) {+ Fragment fragment = new Fragment(componentId, "projectFrag", DashboardPage.this);+ Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());+ Link<Void> link = new ViewStateAwarePageLink<Void>("link",+ ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));+ link.add(new Label("name", project.getName()));+ fragment.add(link);+ cellItem.add(fragment);+ cellItem.add(AttributeAppender.append("class", "project"));}-- };- projectsContainer.setOutputMarkupPlaceholderTag(true);- add(projectsContainer);+ });++ columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Author")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,+ IModel<ProjectFacade> rowModel) {+ Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());+ RevCommit lastCommit = project.getLastCommit();+ if (lastCommit != null) {+ Fragment fragment = new Fragment(componentId, "authorFrag", DashboardPage.this);+ fragment.add(new AvatarLink("avatar", lastCommit.getAuthorIdent()));+ fragment.add(new UserLink("name", lastCommit.getAuthorIdent()));+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));+ }+ cellItem.add(AttributeAppender.append("class", "author"));+ }+ });- projectsContainer.add(projectsView = new PageableListView<Project>("projects",- new LoadableDetachableModel<List<Project>>() {+ columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Commit Message")) {@Override- protected List<Project> load() {- ProjectManager projectManager = GitPlex.getInstance(ProjectManager.class);- List<Project> projects = new ArrayList<>();- for (Project project: projectManager.findAllAccessible(getLoginUser())) {- if (project.matches(searchInput)) {- projects.add(project);- }+ public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,+ IModel<ProjectFacade> rowModel) {+ Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());+ RevCommit lastCommit = project.getLastCommit();+ if (lastCommit != null) {+ Fragment fragment = new Fragment(componentId, "commitMessageFrag", DashboardPage.this);+ PageParameters params = CommitDetailPage.paramsOf(project, lastCommit.name());+ Link<Void> link = new BookmarkablePageLink<Void>("link", CommitDetailPage.class, params);+ link.add(new Label("message", lastCommit.getShortMessage()));+ fragment.add(link);+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));}- projects.sort(Project::compareLastVisit);- return projects;+ cellItem.add(AttributeAppender.append("class", "commit-message"));}-- }, WebConstants.PAGE_SIZE) {+ });++ columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Commit Date")) {@Override- protected void populateItem(ListItem<Project> item) {- Project project = item.getModelObject();- Link<Void> link = new ViewStateAwarePageLink<Void>("link",- ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));- link.add(new Label("name", project.getName()));- item.add(link);+ public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,+ IModel<ProjectFacade> rowModel) {+ Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());+ RevCommit lastCommit = project.getLastCommit();+ if (lastCommit != null) {+ cellItem.add(new Label(componentId, DateUtils.formatAge(lastCommit.getCommitterIdent().getWhen())));+ } else {+ cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));+ }+ cellItem.add(AttributeAppender.append("class", "commit-date"));}-});++ SortableDataProvider<ProjectFacade, Void> dataProvider = new SortableDataProvider<ProjectFacade, Void>() {- add(projectsPageNav = new BootstrapAjaxPagingNavigator("projectsPageNav", projectsView) {+ @Override+ public Iterator<? extends ProjectFacade> iterator(long first, long count) {+ List<ProjectFacade> projects = projectsModel.getObject();+ if (first + count <= projects.size())+ return projects.subList((int)first, (int)(first+count)).iterator();+ else+ return projects.subList((int)first, projects.size()).iterator();+ }@Override- protected void onConfigure() {- super.onConfigure();- setVisible(projectsView.getPageCount() > 1);+ public long size() {+ return projectsModel.getObject().size();}-- });- projectsPageNav.setOutputMarkupPlaceholderTag(true);++ @Override+ public IModel<ProjectFacade> model(ProjectFacade object) {+ return Model.of(object);+ }+ };- add(noProjectsContainer = new WebMarkupContainer("noProjects") {+ projectsTable = new DataTable<ProjectFacade, Void>("projects", columns, dataProvider, WebConstants.PAGE_SIZE);+ projectsTable.addBottomToolbar(new AjaxNavigationToolbar(projectsTable) {@Override- protected void onConfigure() {- super.onConfigure();- setVisible(projectsView.getModelObject().isEmpty());+ protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {+ return new BootstrapAjaxPagingNavigator(navigatorId, table);}});- noProjectsContainer.setOutputMarkupPlaceholderTag(true);+ projectsTable.addBottomToolbar(new NoRecordsToolbar(projectsTable, Model.of("No Projects Found")));+ projectsTable.setOutputMarkupId(true);+ add(projectsTable);+ }++ @Override+ protected void onDetach() {+ projectsModel.detach();+ super.onDetach();}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/home/dashboard.css b/web/src/main/java/com/gitplex/server/web/page/home/dashboard.cssindex 8b586d6a2f..5eec63cd8e 100644--- a/web/src/main/java/com/gitplex/server/web/page/home/dashboard.css+++ b/web/src/main/java/com/gitplex/server/web/page/home/dashboard.css@@ -16,3 +16,21 @@#dashboard ul li a:hover {background: #EEE;}++#dashboard table.projects {+ font-size: 13px;+}+#dashboard table.projects td.project {+ font-size: 14px;+}++#dashboard table.projects a {+ color: #444;+}+#dashboard table.projects td.author img.avatar {+ width: 20px;+ height: 20px;+}+#dashboard table.projects td.author span, #dashboard table.projects td.commit-date {+ color: #888;+}diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.javaindex 3b39e265d4..56874c2524 100644--- a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java@@ -3,8 +3,6 @@ package com.gitplex.server.web.page.layout;import java.text.SimpleDateFormat;import java.util.Collection;-import javax.annotation.Nullable;-import org.apache.wicket.Component;import org.apache.wicket.RestartResponseAtInterceptPageException;import org.apache.wicket.event.IEvent;@@ -21,7 +19,6 @@ import com.gitplex.launcher.loader.AppLoader;import com.gitplex.launcher.loader.Plugin;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.ConfigManager;-import com.gitplex.server.model.Project;import com.gitplex.server.model.User;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.avatar.AvatarLink;@@ -183,11 +180,6 @@ public abstract class LayoutPage extends BasePage {return true;}- @Nullable- protected Project getProject() {- return null;- }-@Overridepublic Collection<WebSocketRegion> getWebSocketRegions() {Collection<WebSocketRegion> regions = super.getWebSocketRegions();diff --git a/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.java b/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.javaindex 8d42dae07b..d1c5e26116 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectPage.java@@ -29,7 +29,7 @@ import org.eclipse.jgit.lib.ObjectId;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.ProjectManager;-import com.gitplex.server.manager.VisitInfoManager;+import com.gitplex.server.manager.UserInfoManager;import com.gitplex.server.model.Project;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.floating.FloatingPanel;@@ -54,20 +54,20 @@ import com.google.common.base.Preconditions;@SuppressWarnings("serial")public abstract class ProjectPage extends LayoutPage {- private static final String PARAM_DEPOT = "project";+ private static final String PARAM_PROJECT = "project";protected final IModel<Project> projectModel;public static PageParameters paramsOf(Project project) {PageParameters params = new PageParameters();- params.set(PARAM_DEPOT, project.getName());+ params.set(PARAM_PROJECT, project.getName());return params;}public ProjectPage(PageParameters params) {super(params);- String projectName = params.get(PARAM_DEPOT).toString();+ String projectName = params.get(PARAM_PROJECT).toString();Preconditions.checkNotNull(projectName);if (projectName.endsWith(Constants.DOT_GIT_EXT))@@ -116,7 +116,7 @@ public abstract class ProjectPage extends LayoutPage {protected void onAfterRender() {super.onAfterRender();if (getLoginUser() != null)- GitPlex.getInstance(VisitInfoManager.class).visit(getLoginUser(), getProject());+ GitPlex.getInstance(UserInfoManager.class).visit(getLoginUser(), getProject());}@Override@@ -168,7 +168,6 @@ public abstract class ProjectPage extends LayoutPage {return SecurityUtils.canRead(getProject());}- @Overridepublic Project getProject() {return projectModel.getObject();}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.javaindex a2a6489542..c5ada7b152 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java@@ -82,7 +82,7 @@ class LastCommitsResource extends AbstractResource {User user = userManager.find(author);if (user != null) {info.authorName = HtmlEscape.escapeHtml5(user.getDisplayName());- info.authorAvatarUrl = avatarManager.getAvatarUrl(user);+ info.authorAvatarUrl = avatarManager.getAvatarUrl(user.getFacade());params = UserProfilePage.paramsOf(user);info.authorUrl = RequestCycle.get().urlFor(UserProfilePage.class, params).toString();} else {diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/folder-view.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/folder-view.cssindex 746ade0e51..db55ff7ef9 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/folder-view.css+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/folder-view.css@@ -18,7 +18,7 @@color: #444;font-size: 13px;}-.folder-view>table>tbody>tr>td.last-commit .when {+.folder-view>table>tbody>tr>td.last-commit.author span, .folder-view>table>tbody>tr>td.last-commit.when {color: #888;}.folder-view>table>tbody>tr:first-child>td {diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/folder-view.js b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/folder-view.jsindex 6f6c54e5ec..0d134ddc91 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/folder-view.js+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/folder-view.js@@ -28,7 +28,7 @@ gitplex.server.folderView = function(containerId, lastCommitsUrl) {html += "<span>" + lastCommit.authorName + "</span>";$row.children(".last-commit.author").empty().append(html);- $row.children(".last-commit.when").append("<span class='when'>" + lastCommit.when + "</span>");+ $row.children(".last-commit.when").append("<span>" + lastCommit.when + "</span>");$row.children(".last-commit.message").append("<a href='" + lastCommit.url + "'>" + lastCommit.summary + "</a>");}});diff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.javaindex 26c79507df..07c6c4df12 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java@@ -10,11 +10,13 @@ import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;+import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;@@ -33,18 +35,20 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.GroupManager;+import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.UserAuthorizationManager;import com.gitplex.server.manager.UserManager;-import com.gitplex.server.model.Group;-import com.gitplex.server.model.GroupAuthorization;import com.gitplex.server.model.User;import com.gitplex.server.model.UserAuthorization;-import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.ProjectPrivilege;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.util.facade.GroupAuthorizationFacade;+import com.gitplex.server.util.facade.GroupFacade;+import com.gitplex.server.util.facade.MembershipFacade;+import com.gitplex.server.util.facade.UserAuthorizationFacade;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.avatar.AvatarLink;@@ -67,78 +71,107 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {private String searchInput;- private DataTable<User, Void> authorizationsTable;+ private DataTable<Long, Void> authorizationsTable;- private SelectionColumn<User, Void> selectionColumn;+ private SelectionColumn<Long, Void> selectionColumn;- private IModel<Map<User, ProjectPrivilege>> userAuthorizationsModel =- new LoadableDetachableModel<Map<User, ProjectPrivilege>>() {+ private IModel<Map<Long, UserAuthorizationFacade>> explicitUserAuthorizationsModel =+ new LoadableDetachableModel<Map<Long, UserAuthorizationFacade>>() {@Override- protected Map<User, ProjectPrivilege> load() {- Map<User, ProjectPrivilege> userAuthorizations = new HashMap<>();- Collection<User> usersAuthorizedFromOtherSources = new HashSet<>();- UserManager userManager = GitPlex.getInstance(UserManager.class);- userAuthorizations.put(userManager.getRoot(), ProjectPrivilege.ADMIN);- usersAuthorizedFromOtherSources.add(userManager.getRoot());-- EntityCriteria<Group> adminGroupCriteria = EntityCriteria.of(Group.class);- adminGroupCriteria.add(Restrictions.eq("administrator", true));- for (Group group: GitPlex.getInstance(GroupManager.class).findAll(adminGroupCriteria)) {- for (User user: group.getMembers()) {- userAuthorizations.put(user, ProjectPrivilege.ADMIN);- usersAuthorizedFromOtherSources.add(user);+ protected Map<Long, UserAuthorizationFacade> load() {+ Map<Long, UserAuthorizationFacade> authorizations = new HashMap<>();+ for (UserAuthorizationFacade authorization:+ GitPlex.getInstance(CacheManager.class).getUserAuthorizations().values()) {+ if (authorization.getProjectId().equals(getProject().getId()))+ authorizations.put(authorization.getUserId(), authorization);+ }+ return authorizations;+ }++ };++ private IModel<Map<Long, ProjectPrivilege>> userAuthorizationsModel =+ new LoadableDetachableModel<Map<Long, ProjectPrivilege>>() {++ @Override+ protected Map<Long, ProjectPrivilege> load() {+ Map<Long, ProjectPrivilege> userAuthorizations = new HashMap<>();+ Collection<Long> usersAuthorizedFromOtherSources = new HashSet<>();+ userAuthorizations.put(User.ROOT_ID, ProjectPrivilege.ADMIN);+ usersAuthorizedFromOtherSources.add(User.ROOT_ID);++ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);+ Set<Long> adminGroupIds = new HashSet<>();+ for (GroupFacade group: cacheManager.getGroups().values()) {+ if (group.isAdministrator())+ adminGroupIds.add(group.getId());+ }+ for (MembershipFacade membership: cacheManager.getMemberships().values()) {+ if (adminGroupIds.contains(membership.getGroupId())) {+ userAuthorizations.put(membership.getUserId(), ProjectPrivilege.ADMIN);+ usersAuthorizedFromOtherSources.add(membership.getUserId());}}- for (GroupAuthorization authorization: getProject().getGroupAuthorizations()) {- for (User user: authorization.getGroup().getMembers()) {- ProjectPrivilege privilege = userAuthorizations.get(user);- if (privilege == null || authorization.getPrivilege().implies(privilege))- userAuthorizations.put(user, authorization.getPrivilege());- usersAuthorizedFromOtherSources.add(user);++ Map<Long, ProjectPrivilege> groupAuthorizations = new HashMap<>();+ for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {+ if (authorization.getProjectId().equals(getProject().getId()))+ groupAuthorizations.put(authorization.getGroupId(), authorization.getPrivilege());+ }+ for (MembershipFacade membership: cacheManager.getMemberships().values()) {+ ProjectPrivilege groupPrivilege = groupAuthorizations.get(membership.getGroupId());+ if (groupPrivilege != null) {+ ProjectPrivilege userPrivilege = userAuthorizations.get(membership.getUserId());+ if (userPrivilege == null || groupPrivilege.implies(userPrivilege))+ userAuthorizations.put(membership.getUserId(), groupPrivilege);+ usersAuthorizedFromOtherSources.add(membership.getUserId());}}- for (UserAuthorization authorization: getProject().getUserAuthorizations()) {- ProjectPrivilege privilege = userAuthorizations.get(authorization.getUser());- if (privilege == null || authorization.getPrivilege().implies(privilege))- userAuthorizations.put(authorization.getUser(), authorization.getPrivilege());+ for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {+ if (authorization.getProjectId().equals(getProject().getId())) {+ ProjectPrivilege userPrivilege = userAuthorizations.get(authorization.getUserId());+ if (userPrivilege == null || authorization.getPrivilege().implies(userPrivilege))+ userAuthorizations.put(authorization.getUserId(), authorization.getPrivilege());+ }}if (getProject().isPublicRead()) {- for (User user: userManager.findAll()) {- ProjectPrivilege privilege = userAuthorizations.get(user);- if (privilege == null || ProjectPrivilege.READ.implies(privilege))- userAuthorizations.put(user, ProjectPrivilege.READ);- usersAuthorizedFromOtherSources.add(user);+ for (UserFacade user: cacheManager.getUsers().values()) {+ ProjectPrivilege userPrivilege = userAuthorizations.get(user);+ if (userPrivilege == null || ProjectPrivilege.READ.implies(userPrivilege))+ userAuthorizations.put(user.getId(), ProjectPrivilege.READ);+ usersAuthorizedFromOtherSources.add(user.getId());}}- Map<User, UserAuthorization> projectAuthorizationMap = getProjectAuthorizationMap();- List<User> users = new ArrayList<>(userAuthorizations.keySet());- Collections.sort(users, new Comparator<User>() {+ Map<Long, UserAuthorizationFacade> explicitUserAuthorizations = getExplicitUserAuthorizations();+ List<Long> userIds = new ArrayList<>(userAuthorizations.keySet());+ Collections.sort(userIds, new Comparator<Long>() {@Override- public int compare(User o1, User o2) {+ public int compare(Long o1, Long o2) {if (usersAuthorizedFromOtherSources.contains(o1)) {if (usersAuthorizedFromOtherSources.contains(o2)) {- return o1.getDisplayName().compareTo(o2.getDisplayName());+ return o1.compareTo(o2);} else {- return -1;+ return 1;}} else {if (usersAuthorizedFromOtherSources.contains(o2)) {- return 1;+ return -1;} else {- return projectAuthorizationMap.get(o2).getId()- .compareTo(projectAuthorizationMap.get(o1).getId());+ return explicitUserAuthorizations.get(o2).getId()+ .compareTo(explicitUserAuthorizations.get(o1).getId());}}}});- Map<User, ProjectPrivilege> sortedUserAuthorizations = new LinkedHashMap<>();- for (User user: users)- sortedUserAuthorizations.put(user, userAuthorizations.get(user));+ Map<Long, ProjectPrivilege> sortedUserAuthorizations = new LinkedHashMap<>();+ for (Long userId: userIds) {+ sortedUserAuthorizations.put(userId, userAuthorizations.get(userId));+ }return sortedUserAuthorizations;}@@ -151,26 +184,23 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {@Overrideprotected void onDetach() {+ explicitUserAuthorizationsModel.detach();userAuthorizationsModel.detach();super.onDetach();}- private Map<User, UserAuthorization> getProjectAuthorizationMap() {- Map<User, UserAuthorization> projectAuthorizationMap = new HashMap<>();- for (UserAuthorization authorization: getProject().getUserAuthorizations()) {- projectAuthorizationMap.put(authorization.getUser(), authorization);- }- return projectAuthorizationMap;- }-- private Map<User, ProjectPrivilege> getUserAuthorizations() {+ private Map<Long, ProjectPrivilege> getUserAuthorizations() {return userAuthorizationsModel.getObject();}- private boolean isPrivilegeFromOtherSources(User user) {- UserAuthorization projectAuthorization = getProjectAuthorizationMap().get(user);- ProjectPrivilege privilege = getUserAuthorizations().get(user);- return projectAuthorization == null || !projectAuthorization.getPrivilege().implies(privilege);+ private Map<Long, UserAuthorizationFacade> getExplicitUserAuthorizations() {+ return explicitUserAuthorizationsModel.getObject();+ }++ private boolean isPrivilegeFromOtherSources(Long userId) {+ UserAuthorizationFacade authorization = getExplicitUserAuthorizations().get(userId);+ ProjectPrivilege privilege = getUserAuthorizations().get(userId);+ return authorization == null || !authorization.getPrivilege().implies(privilege);}@Override@@ -190,19 +220,19 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {});- add(new SelectToAddChoice<User>("addNew", new AbstractUserChoiceProvider() {+ add(new SelectToAddChoice<UserFacade>("addNew", new AbstractUserChoiceProvider() {@Override- public void query(String term, int page, Response<User> response) {- List<User> notAuthorized = new ArrayList<>();+ public void query(String term, int page, Response<UserFacade> response) {+ List<UserFacade> notAuthorized = new ArrayList<>();- for (User user: GitPlex.getInstance(UserManager.class).findAll()) {- if (user.matches(searchInput) && !getUserAuthorizations().containsKey(user))+ for (UserFacade user: GitPlex.getInstance(CacheManager.class).getUsers().values()) {+ if (user.matchesQuery(term) && !getUserAuthorizations().containsKey(user.getId()))notAuthorized.add(user);}Collections.sort(notAuthorized);Collections.reverse(notAuthorized);- new ResponseFiller<User>(response).fill(notAuthorized, page, WebConstants.PAGE_SIZE);+ new ResponseFiller<UserFacade>(response).fill(notAuthorized, page, WebConstants.PAGE_SIZE);}}) {@@ -218,12 +248,13 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {}@Override- protected void onSelect(AjaxRequestTarget target, User selection) {+ protected void onSelect(AjaxRequestTarget target, UserFacade selection) {UserAuthorization authorization = new UserAuthorization();authorization.setProject(getProject());- authorization.setUser(selection);+ authorization.setUser(GitPlex.getInstance(UserManager.class).load(selection.getId()));GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);target.add(authorizationsTable);+ Session.get().success("User added");}@Override@@ -240,14 +271,16 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {@Overridepublic void onClick(AjaxRequestTarget target) {Collection<UserAuthorization> authorizationsToDelete = new HashSet<>();- Map<User, UserAuthorization> projectAuthorizationMap = getProjectAuthorizationMap();- for (IModel<User> model: selectionColumn.getSelections()) {- UserAuthorization authorization = projectAuthorizationMap.get(model.getObject());- if (authorization != null)- authorizationsToDelete.add(authorization);+ Map<Long, UserAuthorizationFacade> explicitUserAuthorizations = getExplicitUserAuthorizations();+ UserAuthorizationManager userAuthorizationManager = GitPlex.getInstance(UserAuthorizationManager.class);+ for (IModel<Long> model: selectionColumn.getSelections()) {+ UserAuthorizationFacade authorization = explicitUserAuthorizations.get(model.getObject());+ if (authorization != null) {+ authorizationsToDelete.add(userAuthorizationManager.load(authorization.getId()));+ explicitUserAuthorizations.remove(model.getObject());+ }}- GitPlex.getInstance(UserAuthorizationManager.class).delete(authorizationsToDelete);- getProject().getUserAuthorizations().removeAll(authorizationsToDelete);+ userAuthorizationManager.delete(authorizationsToDelete);target.add(authorizationsTable);selectionColumn.getSelections().clear();target.add(this);@@ -258,9 +291,9 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {super.onConfigure();boolean hasLocalPrivileges = false;- for (IModel<User> model: selectionColumn.getSelections()) {- User user = model.getObject();- if (!isPrivilegeFromOtherSources(user)) {+ for (IModel<Long> model: selectionColumn.getSelections()) {+ Long userId = model.getObject();+ if (!isPrivilegeFromOtherSources(userId)) {hasLocalPrivileges = true;break;}@@ -272,9 +305,9 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {deleteSelected.setOutputMarkupPlaceholderTag(true);add(deleteSelected);- List<IColumn<User, Void>> columns = new ArrayList<>();+ List<IColumn<Long, Void>> columns = new ArrayList<>();- selectionColumn = new SelectionColumn<User, Void>() {+ selectionColumn = new SelectionColumn<Long, Void>() {@Overrideprotected void onSelectionChange(AjaxRequestTarget target) {@@ -284,32 +317,34 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {};columns.add(selectionColumn);- columns.add(new AbstractColumn<User, Void>(Model.of("User")) {+ columns.add(new AbstractColumn<Long, Void>(Model.of("User")) {@Override- public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId,- IModel<User> rowModel) {+ public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId, IModel<Long> rowModel) {Fragment fragment = new Fragment(componentId, "userFrag", ProjectAuthorizationsPage.this);- fragment.add(new AvatarLink("avatarLink", rowModel.getObject()));- fragment.add(new UserLink("nameLink", rowModel.getObject()));+ User user = GitPlex.getInstance(UserManager.class).load(rowModel.getObject());+ fragment.add(new AvatarLink("avatarLink", user));+ fragment.add(new UserLink("nameLink", user));cellItem.add(fragment);}});- columns.add(new AbstractColumn<User, Void>(Model.of("Permission")) {+ columns.add(new AbstractColumn<Long, Void>(Model.of("Permission")) {@Override- public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId,- IModel<User> rowModel) {+ public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId, IModel<Long> rowModel) {Fragment fragment = new Fragment(componentId, "privilegeFrag", ProjectAuthorizationsPage.this) {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);+ Long userId = rowModel.getObject();+ boolean canNotDelete = isPrivilegeFromOtherSources(userId)+ || userId.equals(SecurityUtils.getUser().getId());String script = String.format(""+ "$('#%s').closest('tr').find('.row-selector input').prop('disabled', %b);",- getMarkupId(), isPrivilegeFromOtherSources(rowModel.getObject()));+ getMarkupId(), canNotDelete);response.render(OnDomReadyHeaderItem.forScript(script));}@@ -325,20 +360,32 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {@Overrideprotected void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege) {dropdown.close();- User user = rowModel.getObject();- UserAuthorization userAuthorization = getProjectAuthorizationMap().get(user);- if (userAuthorization == null) {+ Long userId = rowModel.getObject();++ Map<Long, UserAuthorizationFacade> explicitUserAuthorizations =+ getExplicitUserAuthorizations();+ UserAuthorizationFacade userAuthorizationFacade =+ explicitUserAuthorizations.get(userId);+ UserAuthorizationManager userAuthorizationManager =+ GitPlex.getInstance(UserAuthorizationManager.class);+ UserAuthorization userAuthorization;+ if (userAuthorizationFacade == null) {userAuthorization = new UserAuthorization();userAuthorization.setProject(getProject());- userAuthorization.setUser(user);- getProject().getUserAuthorizations().add(userAuthorization);+ userAuthorization.setUser(GitPlex.getInstance(UserManager.class).load(userId));+ } else {+ userAuthorization = userAuthorizationManager.load(userAuthorizationFacade.getId());}userAuthorization.setPrivilege(privilege);- if (getUserAuthorizations().get(user) != privilege) {- Session.get().warn("Specified permission is not taking effect as a higher permission is granted from other sources");- }- GitPlex.getInstance(UserAuthorizationManager.class).save(userAuthorization);+ userAuthorizationManager.save(userAuthorization);+ explicitUserAuthorizations.put(userId, userAuthorization.getFacade());+target.add(fragment);++ if (getUserAuthorizations().get(userId) != privilege) {+ Session.get().warn("Specified permission is not taking effect as a higher "+ + "permission is granted from other sources");+ }}};@@ -353,6 +400,10 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {}}));+ if (rowModel.getObject().equals(SecurityUtils.getUser().getId())) {+ dropdown.add(AttributeAppender.append("disabled", "true"));+ dropdown.setEnabled(false);+ }fragment.add(dropdown);fragment.add(new DropdownLink("otherSources") {@@ -365,8 +416,9 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- User user = rowModel.getObject();- return new PrivilegeSourcePanel(id, user, getProject(), getUserAuthorizations().get(user));+ Long userId = rowModel.getObject();+ User user = GitPlex.getInstance(UserManager.class).load(userId);+ return new PrivilegeSourcePanel(id, user, getProject(), getUserAuthorizations().get(userId));}});@@ -376,37 +428,39 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {}});- SortableDataProvider<User, Void> dataProvider = new SortableDataProvider<User, Void>() {+ SortableDataProvider<Long, Void> dataProvider = new SortableDataProvider<Long, Void>() {+ private List<Long> getUserIds() {+ List<Long> userIds = new ArrayList<>();+ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);+ for (Long userId: getUserAuthorizations().keySet()) {+ if (cacheManager.getUser(userId).matchesQuery(searchInput))+ userIds.add(userId);+ }+ return userIds;+ }+@Override- public Iterator<? extends User> iterator(long first, long count) {- List<User> users = new ArrayList<>(getUserAuthorizations().keySet());- if (first + count <= users.size())- return users.subList((int)first, (int)(first+count)).iterator();+ public Iterator<? extends Long> iterator(long first, long count) {+ List<Long> userIds = getUserIds();+ if (first + count <= userIds.size())+ return userIds.subList((int)first, (int)(first+count)).iterator();else- return users.subList((int)first, users.size()).iterator();+ return userIds.subList((int)first, userIds.size()).iterator();}@Overridepublic long size() {- return getUserAuthorizations().size();+ return getUserIds().size();}@Override- public IModel<User> model(User object) {- Long userId = object.getId();- return new LoadableDetachableModel<User>() {-- @Override- protected User load() {- return GitPlex.getInstance(UserManager.class).load(userId);- }-- };+ public IModel<Long> model(Long object) {+ return Model.of(object);}};- add(authorizationsTable = new DefaultDataTable<User, Void>("authorizations", columns,+ add(authorizationsTable = new DefaultDataTable<Long, Void>("authorizations", columns,dataProvider, WebConstants.PAGE_SIZE));}}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/project-setting.css b/web/src/main/java/com/gitplex/server/web/page/project/setting/project-setting.cssindex 5f08c1a24c..cbf32385e9 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/setting/project-setting.css+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/project-setting.css@@ -60,24 +60,6 @@width: 45%;}-#project-setting .authorization .list table td.actions {- width: 20%;- white-space: nowrap;-}-#project-setting .authorization .list td.name .note {- font-size: 12px;- color: #888;- margin-top: 4px;-}-#project-setting .authorization .list td.privilege {- width: 20%;-}--.modal .transfer-project .message {- font-size: 13px;- margin-bottom: 20px;-}-#project-setting .commit-message-transform>label {float: left;margin-right: 4px;@@ -89,4 +71,7 @@margin-left: 4px;color: #DCB508;vertical-align: middle;-}\ No newline at end of file+}+#project-setting .authorization.list .head .select2-container {+ width: 240px;+}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/user/AvatarEditPage.java b/web/src/main/java/com/gitplex/server/web/page/user/AvatarEditPage.javaindex 4de7886d9c..5859507584 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/AvatarEditPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/AvatarEditPage.java@@ -75,7 +75,7 @@ public class AvatarEditPage extends UserPage {protected void onConfigure() {super.onConfigure();AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);- setVisible(avatarManager.getUploaded(userModel.getObject()).exists());+ setVisible(avatarManager.getUploaded(userModel.getObject().getFacade()).exists());}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.javaindex 2d956cafa9..c181064f4b 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java@@ -36,14 +36,17 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.UserAuthorizationManager;-import com.gitplex.server.model.GroupAuthorization;-import com.gitplex.server.model.Membership;import com.gitplex.server.model.Project;import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.permission.SystemAdministration;+import com.gitplex.server.util.facade.GroupAuthorizationFacade;+import com.gitplex.server.util.facade.MembershipFacade;+import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.util.facade.UserAuthorizationFacade;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.datatable.DefaultDataTable;@@ -64,68 +67,93 @@ public class UserAuthorizationsPage extends UserPage {private String searchInput;- private DataTable<Project, Void> authorizationsTable;+ private DataTable<Long, Void> authorizationsTable;- private SelectionColumn<Project, Void> selectionColumn;+ private SelectionColumn<Long, Void> selectionColumn;- private IModel<Map<Project, ProjectPrivilege>> projectAuthorizationsModel =- new LoadableDetachableModel<Map<Project, ProjectPrivilege>>() {+ private IModel<Map<Long, UserAuthorizationFacade>> explicitProjectAuthorizationsModel =+ new LoadableDetachableModel<Map<Long, UserAuthorizationFacade>>() {@Override- protected Map<Project, ProjectPrivilege> load() {- Map<Project, ProjectPrivilege> projectAuthorizations = new HashMap<>();- Collection<Project> projectsAuthorizedFromOtherSources = new HashSet<>();+ protected Map<Long, UserAuthorizationFacade> load() {+ Map<Long, UserAuthorizationFacade> authorizations = new HashMap<>();+ for (UserAuthorizationFacade authorization:+ GitPlex.getInstance(CacheManager.class).getUserAuthorizations().values()) {+ if (authorization.getUserId().equals(getUser().getId()))+ authorizations.put(authorization.getProjectId(), authorization);+ }+ return authorizations;+ }++ };+ private IModel<Map<Long, ProjectPrivilege>> projectAuthorizationsModel =+ new LoadableDetachableModel<Map<Long, ProjectPrivilege>>() {++ @Override+ protected Map<Long, ProjectPrivilege> load() {+ Map<Long, ProjectPrivilege> projectAuthorizations = new HashMap<>();+ Collection<Long> projectsAuthorizedFromOtherSources = new HashSet<>();+ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);+if (getUser().asSubject().isPermitted(new SystemAdministration())) {- for (Project project: GitPlex.getInstance(ProjectManager.class).findAll()) {- projectAuthorizations.put(project, ProjectPrivilege.ADMIN);- projectsAuthorizedFromOtherSources.add(project);+ for (ProjectFacade project: cacheManager.getProjects().values()) {+ projectAuthorizations.put(project.getId(), ProjectPrivilege.ADMIN);+ projectsAuthorizedFromOtherSources.add(project.getId());}} else {- for (UserAuthorization authorization: getUser().getAuthorizations())- projectAuthorizations.put(authorization.getProject(), authorization.getPrivilege());- for (Membership membership: getUser().getMemberships()) {- for (GroupAuthorization authorization: membership.getGroup().getAuthorizations()) {- ProjectPrivilege existingPrivilege = projectAuthorizations.get(authorization.getProject());- if (existingPrivilege == null || authorization.getPrivilege().implies(existingPrivilege))- projectAuthorizations.put(authorization.getProject(), authorization.getPrivilege());- projectsAuthorizedFromOtherSources.add(authorization.getProject());+ for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {+ if (authorization.getUserId().equals(getUser().getId()))+ projectAuthorizations.put(authorization.getProjectId(), authorization.getPrivilege());+ }+ Collection<Long> groupIds = new HashSet<>();+ for (MembershipFacade membership: cacheManager.getMemberships().values()) {+ if (membership.getUserId().equals(getUser().getId()))+ groupIds.add(membership.getGroupId());+ }+ for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {+ if (groupIds.contains(authorization.getGroupId())) {+ ProjectPrivilege privilege = projectAuthorizations.get(authorization.getProjectId());+ if (privilege == null || authorization.getPrivilege().implies(privilege))+ projectAuthorizations.put(authorization.getProjectId(), authorization.getPrivilege());+ projectsAuthorizedFromOtherSources.add(authorization.getProjectId());}}- for (Project project: GitPlex.getInstance(ProjectManager.class).findAll()) {+ for (ProjectFacade project: cacheManager.getProjects().values()) {if (project.isPublicRead()) {- if (!projectAuthorizations.containsKey(project))- projectAuthorizations.put(project, ProjectPrivilege.READ);- projectsAuthorizedFromOtherSources.add(project);+ if (!projectAuthorizations.containsKey(project.getId()))+ projectAuthorizations.put(project.getId(), ProjectPrivilege.READ);+ projectsAuthorizedFromOtherSources.add(project.getId());}}}- Map<Project, UserAuthorization> userAuthorizationMap = getUserAuthorizationMap();- List<Project> projects = new ArrayList<>(projectAuthorizations.keySet());- Collections.sort(projects, new Comparator<Project>() {+ Map<Long, UserAuthorizationFacade> explicitProjectAuthorizations = getExplicitProjectAuthorizations();+ List<Long> projectIds = new ArrayList<>(projectAuthorizations.keySet());+ Collections.sort(projectIds, new Comparator<Long>() {@Override- public int compare(Project o1, Project o2) {+ public int compare(Long o1, Long o2) {if (projectsAuthorizedFromOtherSources.contains(o1)) {if (projectsAuthorizedFromOtherSources.contains(o2)) {- return o1.getName().compareTo(o2.getName());+ return o1.compareTo(o2);} else {- return -1;+ return 1;}} else {if (projectsAuthorizedFromOtherSources.contains(o2)) {- return 1;+ return -1;} else {- return userAuthorizationMap.get(o2).getId().compareTo(userAuthorizationMap.get(o1).getId());+ return explicitProjectAuthorizations.get(o2).getId()+ .compareTo(explicitProjectAuthorizations.get(o1).getId());}}}});- Map<Project, ProjectPrivilege> sortedProjectAuthorizations = new LinkedHashMap<>();- for (Project project: projects)- sortedProjectAuthorizations.put(project, projectAuthorizations.get(project));+ Map<Long, ProjectPrivilege> sortedProjectAuthorizations = new LinkedHashMap<>();+ for (Long projectId: projectIds)+ sortedProjectAuthorizations.put(projectId, projectAuthorizations.get(projectId));return sortedProjectAuthorizations;}@@ -138,26 +166,23 @@ public class UserAuthorizationsPage extends UserPage {@Overrideprotected void onDetach() {+ explicitProjectAuthorizationsModel.detach();projectAuthorizationsModel.detach();super.onDetach();}- private Map<Project, UserAuthorization> getUserAuthorizationMap() {- Map<Project, UserAuthorization> userAuthorizationMap = new HashMap<>();- for (UserAuthorization authorization: getUser().getAuthorizations()) {- userAuthorizationMap.put(authorization.getProject(), authorization);- }- return userAuthorizationMap;+ private Map<Long, UserAuthorizationFacade> getExplicitProjectAuthorizations() {+ return explicitProjectAuthorizationsModel.getObject();}- private Map<Project, ProjectPrivilege> getProjectAuthorizations() {+ private Map<Long, ProjectPrivilege> getProjectAuthorizations() {return projectAuthorizationsModel.getObject();}- private boolean isPrivilegeFromOtherSources(Project project) {- UserAuthorization userAuthorization = getUserAuthorizationMap().get(project);- ProjectPrivilege privilege = getProjectAuthorizations().get(project);- return userAuthorization == null || !userAuthorization.getPrivilege().implies(privilege);+ private boolean isPrivilegeFromOtherSources(Long projectId) {+ UserAuthorizationFacade authorization = getExplicitProjectAuthorizations().get(projectId);+ ProjectPrivilege privilege = getProjectAuthorizations().get(projectId);+ return authorization == null || !authorization.getPrivilege().implies(privilege);}@Override@@ -177,19 +202,19 @@ public class UserAuthorizationsPage extends UserPage {});- add(new SelectToAddChoice<Project>("addNew", new AbstractProjectChoiceProvider() {+ add(new SelectToAddChoice<ProjectFacade>("addNew", new AbstractProjectChoiceProvider() {@Override- public void query(String term, int page, Response<Project> response) {- List<Project> notAuthorized = new ArrayList<>();+ public void query(String term, int page, Response<ProjectFacade> response) {+ List<ProjectFacade> notAuthorizedProjects = new ArrayList<>();- for (Project project: GitPlex.getInstance(ProjectManager.class).findAll()) {- if (project.matches(searchInput) && !getProjectAuthorizations().containsKey(project))- notAuthorized.add(project);+ for (ProjectFacade project: GitPlex.getInstance(CacheManager.class).getProjects().values()) {+ if (project.matchesQuery(term) && !getProjectAuthorizations().containsKey(project.getId()))+ notAuthorizedProjects.add(project);}- Collections.sort(notAuthorized);- Collections.reverse(notAuthorized);- new ResponseFiller<Project>(response).fill(notAuthorized, page, WebConstants.PAGE_SIZE);+ Collections.sort(notAuthorizedProjects);+ Collections.reverse(notAuthorizedProjects);+ new ResponseFiller<ProjectFacade>(response).fill(notAuthorizedProjects, page, WebConstants.PAGE_SIZE);}}) {@@ -205,12 +230,13 @@ public class UserAuthorizationsPage extends UserPage {}@Override- protected void onSelect(AjaxRequestTarget target, Project selection) {+ protected void onSelect(AjaxRequestTarget target, ProjectFacade selection) {UserAuthorization authorization = new UserAuthorization();authorization.setUser(getUser());- authorization.setProject(selection);+ authorization.setProject(GitPlex.getInstance(ProjectManager.class).load(selection.getId()));GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);target.add(authorizationsTable);+ Session.get().success("Project added");}@Override@@ -227,14 +253,16 @@ public class UserAuthorizationsPage extends UserPage {@Overridepublic void onClick(AjaxRequestTarget target) {Collection<UserAuthorization> authorizationsToDelete = new HashSet<>();- Map<Project, UserAuthorization> userAuthorizationMap = getUserAuthorizationMap();- for (IModel<Project> model: selectionColumn.getSelections()) {- UserAuthorization authorization = userAuthorizationMap.get(model.getObject());- if (authorization != null)- authorizationsToDelete.add(authorization);+ Map<Long, UserAuthorizationFacade> explicitProjectAuthorizations = getExplicitProjectAuthorizations();+ UserAuthorizationManager userAuthorizationManager = GitPlex.getInstance(UserAuthorizationManager.class);+ for (IModel<Long> model: selectionColumn.getSelections()) {+ UserAuthorizationFacade authorization = explicitProjectAuthorizations.get(model.getObject());+ if (authorization != null) {+ authorizationsToDelete.add(userAuthorizationManager.load(authorization.getId()));+ explicitProjectAuthorizations.remove(model.getObject());+ }}- GitPlex.getInstance(UserAuthorizationManager.class).delete(authorizationsToDelete);- getUser().getAuthorizations().removeAll(authorizationsToDelete);+ userAuthorizationManager.delete(authorizationsToDelete);target.add(authorizationsTable);selectionColumn.getSelections().clear();target.add(this);@@ -245,9 +273,8 @@ public class UserAuthorizationsPage extends UserPage {super.onConfigure();boolean hasLocalPrivileges = false;- for (IModel<Project> model: selectionColumn.getSelections()) {- Project project = model.getObject();- if (!isPrivilegeFromOtherSources(project)) {+ for (IModel<Long> model: selectionColumn.getSelections()) {+ if (!isPrivilegeFromOtherSources(model.getObject())) {hasLocalPrivileges = true;break;}@@ -259,9 +286,9 @@ public class UserAuthorizationsPage extends UserPage {deleteSelected.setOutputMarkupPlaceholderTag(true);add(deleteSelected);- List<IColumn<Project, Void>> columns = new ArrayList<>();+ List<IColumn<Long, Void>> columns = new ArrayList<>();- selectionColumn = new SelectionColumn<Project, Void>() {+ selectionColumn = new SelectionColumn<Long, Void>() {@Overrideprotected void onSelectionChange(AjaxRequestTarget target) {@@ -271,18 +298,20 @@ public class UserAuthorizationsPage extends UserPage {};columns.add(selectionColumn);- columns.add(new AbstractColumn<Project, Void>(Model.of("Project")) {+ columns.add(new AbstractColumn<Long, Void>(Model.of("Project")) {@Override- public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,- IModel<Project> rowModel) {+ public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId,+ IModel<Long> rowModel) {Fragment fragment = new Fragment(componentId, "projectFrag", UserAuthorizationsPage.this);+ Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject());+ String projectName = project.getName();fragment.add(new BookmarkablePageLink<Void>("project", ProjectBlobPage.class,- ProjectBlobPage.paramsOf(rowModel.getObject())) {+ ProjectBlobPage.paramsOf(project)) {@Overridepublic IModel<?> getBody() {- return Model.of(rowModel.getObject().getName());+ return Model.of(projectName);}});@@ -290,11 +319,11 @@ public class UserAuthorizationsPage extends UserPage {}});- columns.add(new AbstractColumn<Project, Void>(Model.of("Permission")) {+ columns.add(new AbstractColumn<Long, Void>(Model.of("Permission")) {@Override- public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,- IModel<Project> rowModel) {+ public void populateItem(Item<ICellPopulator<Long>> cellItem, String componentId,+ IModel<Long> rowModel) {Fragment fragment = new Fragment(componentId, "privilegeFrag", UserAuthorizationsPage.this) {@Override@@ -319,20 +348,33 @@ public class UserAuthorizationsPage extends UserPage {@Overrideprotected void onSelect(AjaxRequestTarget target, ProjectPrivilege privilege) {dropdown.close();- Project project = rowModel.getObject();- UserAuthorization userAuthorization = getUserAuthorizationMap().get(project);- if (userAuthorization == null) {+ Long projectId = rowModel.getObject();++ Map<Long, UserAuthorizationFacade> explicitProjectAuthorizations =+ getExplicitProjectAuthorizations();+ UserAuthorizationFacade userAuthorizationFacade =+ explicitProjectAuthorizations.get(projectId);+ UserAuthorizationManager userAuthorizationManager =+ GitPlex.getInstance(UserAuthorizationManager.class);+ UserAuthorization userAuthorization;+ if (userAuthorizationFacade == null) {userAuthorization = new UserAuthorization();userAuthorization.setUser(getUser());- userAuthorization.setProject(project);- getUser().getAuthorizations().add(userAuthorization);+ userAuthorization.setProject(+ GitPlex.getInstance(ProjectManager.class).load(projectId));+ } else {+ userAuthorization = userAuthorizationManager.load(userAuthorizationFacade.getId());}userAuthorization.setPrivilege(privilege);- if (getProjectAuthorizations().get(project) != privilege) {- Session.get().warn("Specified permission is not taking effect as a higher permission is granted from other sources");- }- GitPlex.getInstance(UserAuthorizationManager.class).save(userAuthorization);+ userAuthorizationManager.save(userAuthorization);+ explicitProjectAuthorizations.put(projectId, userAuthorization.getFacade());+target.add(fragment);++ if (getProjectAuthorizations().get(projectId) != privilege) {+ Session.get().warn("Specified permission is not taking effect as a higher "+ + "permission is granted from other sources");+ }}};@@ -359,9 +401,9 @@ public class UserAuthorizationsPage extends UserPage {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- Project project = rowModel.getObject();+ Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject());return new PrivilegeSourcePanel(id, getUser(), project,- getProjectAuthorizations().get(project));+ getProjectAuthorizations().get(project.getId()));}});@@ -371,37 +413,39 @@ public class UserAuthorizationsPage extends UserPage {}});- SortableDataProvider<Project, Void> dataProvider = new SortableDataProvider<Project, Void>() {+ SortableDataProvider<Long, Void> dataProvider = new SortableDataProvider<Long, Void>() {+ private List<Long> getProjectIds() {+ List<Long> projectIds = new ArrayList<>();+ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);+ for (Long projectId: getProjectAuthorizations().keySet()) {+ if (cacheManager.getProject(projectId).matchesQuery(searchInput))+ projectIds.add(projectId);+ }+ return projectIds;+ }+@Override- public Iterator<? extends Project> iterator(long first, long count) {- List<Project> projects = new ArrayList<>(getProjectAuthorizations().keySet());- if (first + count <= projects.size())- return projects.subList((int)first, (int)(first+count)).iterator();+ public Iterator<? extends Long> iterator(long first, long count) {+ List<Long> projectIds = getProjectIds();+ if (first + count <= projectIds.size())+ return projectIds.subList((int)first, (int)(first+count)).iterator();else- return projects.subList((int)first, projects.size()).iterator();+ return projectIds.subList((int)first, projectIds.size()).iterator();}@Overridepublic long size() {- return getProjectAuthorizations().size();+ return getProjectIds().size();}@Override- public IModel<Project> model(Project object) {- Long projectId = object.getId();- return new LoadableDetachableModel<Project>() {-- @Override- protected Project load() {- return GitPlex.getInstance(ProjectManager.class).load(projectId);- }-- };+ public IModel<Long> model(Long object) {+ return Model.of(object);}};- add(authorizationsTable = new DefaultDataTable<Project, Void>("authorizations", columns,+ add(authorizationsTable = new DefaultDataTable<Long, Void>("authorizations", columns,dataProvider, WebConstants.PAGE_SIZE));}}diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.javaindex 4a8da328f7..8c3b1f5794 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java@@ -6,7 +6,9 @@ import java.util.Collections;import java.util.HashSet;import java.util.Iterator;import java.util.List;+import java.util.Set;+import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;@@ -31,12 +33,14 @@ import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.GroupManager;import com.gitplex.server.manager.MembershipManager;-import com.gitplex.server.model.Group;import com.gitplex.server.model.Membership;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.util.facade.GroupFacade;+import com.gitplex.server.util.facade.MembershipFacade;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.datatable.DefaultDataTable;@@ -86,18 +90,24 @@ public class UserMembershipsPage extends UserPage {});- add(new SelectToAddChoice<Group>("addNew", new AbstractGroupChoiceProvider() {+ add(new SelectToAddChoice<GroupFacade>("addNew", new AbstractGroupChoiceProvider() {@Override- public void query(String term, int page, Response<Group> response) {- List<Group> notMembersOf = new ArrayList<>();- for (Group group: GitPlex.getInstance(GroupManager.class).findAll()) {- if (group.matches(searchInput) && !getUser().getGroups().contains(group))+ public void query(String term, int page, Response<GroupFacade> response) {+ List<GroupFacade> notMembersOf = new ArrayList<>();+ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);+ Set<Long> groupIds = new HashSet<>();+ for (MembershipFacade membership: cacheManager.getMemberships().values()) {+ if (membership.getUserId().equals(getUser().getId()))+ groupIds.add(membership.getGroupId());+ }+ for (GroupFacade group: cacheManager.getGroups().values()) {+ if (group.matchesQuery(term) && !groupIds.contains(group.getId()))notMembersOf.add(group);}Collections.sort(notMembersOf);Collections.reverse(notMembersOf);- new ResponseFiller<Group>(response).fill(notMembersOf, page, WebConstants.PAGE_SIZE);+ new ResponseFiller<>(response).fill(notMembersOf, page, WebConstants.PAGE_SIZE);}}) {@@ -113,12 +123,13 @@ public class UserMembershipsPage extends UserPage {}@Override- protected void onSelect(AjaxRequestTarget target, Group selection) {+ protected void onSelect(AjaxRequestTarget target, GroupFacade selection) {Membership membership = new Membership();membership.setUser(getUser());- membership.setGroup(selection);+ membership.setGroup(GitPlex.getInstance(GroupManager.class).load(selection.getId()));GitPlex.getInstance(MembershipManager.class).save(membership);target.add(membershipsTable);+ Session.get().success("Group added");}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/user/user.css b/web/src/main/java/com/gitplex/server/web/page/user/user.cssindex 8ea3d9b340..16e49b8c7a 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/user.css+++ b/web/src/main/java/com/gitplex/server/web/page/user/user.css@@ -23,4 +23,9 @@margin-left: 4px;color: #DCB508;vertical-align: middle;-}\ No newline at end of file+}++#user .membership.list .head .select2-container,+#user .authorization.list .head .select2-container {+ width: 240px;+}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java b/web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.javaindex 8d2b74199d..a5dc5f1e86 100644--- a/web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java+++ b/web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java@@ -15,11 +15,11 @@ import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;import com.gitplex.server.manager.CommitInfoManager;import com.gitplex.server.manager.GroupManager;-import com.gitplex.server.model.User;-import com.gitplex.server.model.Project;import com.gitplex.server.model.Group;+import com.gitplex.server.model.Project;import com.gitplex.server.security.ProjectPrivilege;import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.util.facade.UserFacade;import com.gitplex.server.util.stringmatch.PatternApplied;import com.gitplex.server.util.stringmatch.WildcardUtils;import com.gitplex.server.web.behavior.inputassist.InputAssistBehavior;@@ -61,7 +61,7 @@ public class SuggestionUtils {String lowerCaseMatchWith = matchWith.toLowerCase();int numSuggestions = 0;List<InputSuggestion> suggestions = new ArrayList<>();- for (User user: SecurityUtils.findUsersCan(project, privilege)) {+ for (UserFacade user: SecurityUtils.getAuthorizedUsers(project.getFacade(), privilege)) {String name = user.getName();int index = name.toLowerCase().indexOf(lowerCaseMatchWith);if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {diff --git a/web/src/main/java/com/gitplex/server/web/util/avatar/AvatarManager.java b/web/src/main/java/com/gitplex/server/web/util/avatar/AvatarManager.javaindex 63bdcaa1aa..c1dff8cbd9 100644--- a/web/src/main/java/com/gitplex/server/web/util/avatar/AvatarManager.java+++ b/web/src/main/java/com/gitplex/server/web/util/avatar/AvatarManager.java@@ -8,6 +8,7 @@ import org.apache.wicket.markup.html.form.upload.FileUpload;import org.eclipse.jgit.lib.PersonIdent;import com.gitplex.server.model.User;+import com.gitplex.server.util.facade.UserFacade;public interface AvatarManager {@@ -19,7 +20,7 @@ public interface AvatarManager {* @return* url of avatar image. This url will be relative to context root if gravatar is disabled*/- String getAvatarUrl(@Nullable User user);+ String getAvatarUrl(@Nullable UserFacade user);/*** Get URL of avatar image of specified person.@@ -33,7 +34,7 @@ public interface AvatarManager {void useAvatar(User user, @Nullable FileUpload avatar);- File getUploaded(User user);+ File getUploaded(UserFacade user);}diff --git a/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java b/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.javaindex 7a7d7eaeaf..f979a814d2 100644--- a/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java+++ b/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java@@ -23,6 +23,7 @@ import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.LockUtils;import com.gitplex.server.util.StringUtils;+import com.gitplex.server.util.facade.UserFacade;import com.google.common.base.Splitter;import com.google.common.base.Throwables;import com.google.common.collect.Iterables;@@ -43,7 +44,7 @@ public class DefaultAvatarManager implements AvatarManager {@Transactional@Override- public String getAvatarUrl(@Nullable User user) {+ public String getAvatarUrl(@Nullable UserFacade user) {if (user == null) {return AVATARS_BASE_URL + "gitplex.png";} else if (user.getId() == null) {@@ -114,7 +115,7 @@ public class DefaultAvatarManager implements AvatarManager {}@Override- public File getUploaded(User user) {+ public File getUploaded(UserFacade user) {return new File(Bootstrap.getSiteDir(), "avatars/uploaded/" + user.getId());}@@ -124,7 +125,7 @@ public class DefaultAvatarManager implements AvatarManager {Lock avatarLock = LockUtils.getLock("uploaded-avatar:" + user.getId());avatarLock.lock();try {- File avatarFile = getUploaded(user);+ File avatarFile = getUploaded(user.getFacade());if (upload != null) {FileUtils.createDir(avatarFile.getParentFile());try {