Skip to content

The Unified and Autonomous Development Platform

Performance improvements and bugfixes

Robin Shena32c76862a9c
diff --git a/pom.xml b/pom.xml
index fe92fdfca2..30166a9d0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -588,8 +588,8 @@
</repository>
</repositories>
<properties>
- <commons.version>2.2.6</commons.version>
- <agent.version>1.3.21</agent.version>
+ <commons.version>2.2.7</commons.version>
+ <agent.version>1.3.22</agent.version>
<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.9</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Import.java b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
index a5393a703e..c4977cdb69 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/Import.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
@@ -2,6 +2,7 @@ package io.onedev.server.buildspec;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.Stack;
import java.util.stream.Collectors;
@@ -33,7 +34,7 @@ import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.JobSecretAuthorizationContext;
-import io.onedev.server.util.ProjectCollection;
+import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
@@ -83,14 +84,15 @@ public class Import implements Serializable, Validatable {
@SuppressWarnings("unused")
private static List<String> getProjectChoices() {
- List<String> choices = new ArrayList<>();
+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
Project project = ((ProjectPage)WicketUtils.getPage()).getProject();
- ProjectCollection projects = OneDev.getInstance(ProjectManager.class).getPermittedProjects(new AccessProject());
- for (Long projectId: projects.getIds()) {
- if (!projectId.equals(Project.idOf(project)))
- choices.add(projects.getCache().getPath(projectId));
- }
+ Collection<Project> projects = projectManager.getPermittedProjects(new AccessProject());
+ projects.remove(project);
+
+ ProjectCache cache = projectManager.cloneCache();
+
+ List<String> choices = projects.stream().map(it->cache.getPath(it.getId())).collect(Collectors.toList());
Collections.sort(choices);
return choices;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
index 877090fb29..effcc46088 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
@@ -19,7 +19,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.util.EditContext;
-import io.onedev.server.util.ProjectCollection;
+import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -57,12 +57,13 @@ public class ProjectDependency implements Serializable {
@SuppressWarnings("unused")
private static List<String> getProjectChoices() {
List<String> choices = new ArrayList<>();
- Project project = ((ProjectPage)WicketUtils.getPage()).getProject();
- ProjectCollection projects = OneDev.getInstance(ProjectManager.class)
- .getPermittedProjects(new AccessProject());
- for (Long projectId: projects.getIds()) {
- if (!projectId.equals(Project.idOf(project)))
- choices.add(projects.getCache().getPath(projectId));
+ Project currentProject = ((ProjectPage)WicketUtils.getPage()).getProject();
+
+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
+ ProjectCache cache = projectManager.cloneCache();
+ for (Project project: projectManager.getPermittedProjects(new AccessProject())) {
+ if (!project.equals(currentProject))
+ choices.add(cache.getPath(project.getId()));
}
Collections.sort(choices);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java
index b58857f91a..1ba15abf7a 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java
@@ -2,13 +2,10 @@ package io.onedev.server.buildspec.param.spec;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.support.inputspec.userchoiceinput.UserChoiceInput;
import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.AllUsers;
import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;
@@ -74,7 +71,7 @@ public class UserChoiceParam extends ParamSpec {
@Override
public List<String> getPossibleValues() {
- return OneDev.getInstance(UserManager.class).query().stream().map(user->user.getName()).collect(Collectors.toList());
+ return UserChoiceInput.getPossibleValues();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/EmailAddressManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/EmailAddressManager.java
index c470d681d8..18090f2ea9 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/EmailAddressManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/EmailAddressManager.java
@@ -5,13 +5,21 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.PersonIdent;
import io.onedev.server.model.EmailAddress;
+import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityManager;
+import io.onedev.server.util.facade.EmailAddressFacades;
public interface EmailAddressManager extends EntityManager<EmailAddress> {
@Nullable
EmailAddress findByValue(String value);
+ @Nullable
+ EmailAddress findPrimary(User user);
+
+ @Nullable
+ EmailAddress findGit(User user);
+
@Nullable
EmailAddress findByPersonIdent(PersonIdent personIdent);
@@ -20,5 +28,6 @@ public interface EmailAddressManager extends EntityManager<EmailAddress> {
void useForGitOperations(EmailAddress emailAddress);
void sendVerificationEmail(EmailAddress emailAddress);
-
+
+ EmailAddressFacades getCache();
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java
index fa799752aa..8ae005b16a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java
@@ -28,4 +28,6 @@ public interface GroupManager extends EntityManager<Group> {
List<Group> query(@Nullable String term, int firstResult, int maxResults);
+ List<Group> queryAdminstrator();
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueAuthorizationManager.java
index a112489f8e..61f0008d60 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueAuthorizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueAuthorizationManager.java
@@ -1,10 +1,7 @@
package io.onedev.server.entitymanager;
-import io.onedev.server.model.IssueAuthorization;
-
-import javax.annotation.Nullable;
-
import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueAuthorization;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityManager;
@@ -12,7 +9,4 @@ public interface IssueAuthorizationManager extends EntityManager<IssueAuthorizat
void authorize(Issue issue, User user);
- @Nullable
- IssueAuthorization find(Issue issue, User user);
-
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
index 2b3c71ce63..302aa0d704 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
@@ -14,9 +14,9 @@ import org.eclipse.jgit.lib.Repository;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.dao.EntityManager;
import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.util.ProjectCollection;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.facade.ProjectFacade;
+import io.onedev.server.util.facade.ProjectCache;
public interface ProjectManager extends EntityManager<Project> {
@@ -78,6 +78,8 @@ public interface ProjectManager extends EntityManager<Project> {
Collection<Long> getSubtreeIds(Long projectId);
- ProjectCollection getPermittedProjects(Permission permission);
+ Collection<Project> getPermittedProjects(Permission permission);
+
+ ProjectCache cloneCache();
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java
index 4912f51910..700ff13b82 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java
@@ -5,8 +5,12 @@ import java.util.List;
import javax.annotation.Nullable;
+import org.apache.shiro.authz.Permission;
+
+import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityManager;
+import io.onedev.server.util.facade.UserCache;
public interface UserManager extends EntityManager<User> {
@@ -75,10 +79,12 @@ public interface UserManager extends EntityManager<User> {
int count(String term);
- List<User> queryAndSort(Collection<User> topUsers);
-
void onRenameSsoConnector(String oldName, String newName);
void onDeleteSsoConnector(String name);
+
+ Collection<User> getAuthorizedUsers(Project project, Permission permission);
+
+ UserCache cloneCache();
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
index 5a7bc6e770..c240099471 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
@@ -1,15 +1,14 @@
package io.onedev.server.entitymanager.impl;
import java.util.Arrays;
-import java.util.Collection;
+import java.util.Iterator;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.PersonIdent;
import com.google.common.base.Preconditions;
@@ -30,6 +29,8 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.util.facade.EmailAddressFacade;
+import io.onedev.server.util.facade.EmailAddressFacades;
@Singleton
public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress> implements EmailAddressManager {
@@ -42,7 +43,9 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
private final SessionManager sessionManager;
- private final Map<String, Long> idCache = new ConcurrentHashMap<>();
+ private final EmailAddressFacades cache = new EmailAddressFacades();
+
+ private final ReadWriteLock cacheLock = new ReentrantReadWriteLock();
@Inject
public DefaultEmailAddressManager(Dao dao, SettingManager settingManager, MailManager mailManager,
@@ -57,55 +60,83 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
@Listen
@Sessional
public void on(SystemStarted event) {
- for (EmailAddress address: query())
- idCache.put(address.getValue(), address.getId());
+ cacheLock.writeLock().lock();
+ try {
+ for (EmailAddress address: query())
+ cache.put(address.getId(), address.getFacade());
+ } finally {
+ cacheLock.writeLock().unlock();
+ }
}
@Sessional
@Override
public EmailAddress findByValue(String value) {
- Long id = idCache.get(value.toLowerCase());
- return id != null? load(id): null;
+ cacheLock.readLock().lock();
+ try {
+ EmailAddressFacade facade = cache.findByValue(value);
+ if (facade != null)
+ return load(facade.getId());
+ else
+ return null;
+ } finally {
+ cacheLock.readLock().unlock();
+ }
}
@Sessional
@Override
public EmailAddress findByPersonIdent(PersonIdent personIdent) {
- if (StringUtils.isNotBlank(personIdent.getEmailAddress()))
- return findByValue(personIdent.getEmailAddress());
- else
- return null;
+ cacheLock.readLock().lock();
+ try {
+ EmailAddressFacade facade = cache.findByPersonIdent(personIdent);
+ if (facade != null)
+ return load(facade.getId());
+ else
+ return null;
+ } finally {
+ cacheLock.readLock().unlock();
+ }
}
@Transactional
@Override
public void setAsPrimary(EmailAddress emailAddress) {
- for (EmailAddress each: emailAddress.getOwner().getEmailAddresses())
+ for (EmailAddress each: emailAddress.getOwner().getEmailAddresses()) {
each.setPrimary(false);
+ dao.persist(each);
+ }
emailAddress.setPrimary(true);
+ dao.persist(emailAddress);
}
@Transactional
@Override
public void useForGitOperations(EmailAddress emailAddress) {
- for (EmailAddress each: emailAddress.getOwner().getEmailAddresses())
+ for (EmailAddress each: emailAddress.getOwner().getEmailAddresses()) {
each.setGit(false);
+ dao.persist(each);
+ }
emailAddress.setGit(true);
+ dao.persist(emailAddress);
}
@Transactional
@Override
public void delete(EmailAddress emailAddress) {
super.delete(emailAddress);
-
- User user = emailAddress.getOwner();
-
- user.getEmailAddresses().remove(emailAddress);
- if (!user.getSortedEmailAddresses().isEmpty()) {
- if (user.getPrimaryEmailAddress() == null)
- user.getSortedEmailAddresses().iterator().next().setPrimary(true);
- if (user.getGitEmailAddress() == null)
- user.getSortedEmailAddresses().iterator().next().setGit(true);
+
+ if (emailAddress.isPrimary() || emailAddress.isGit()) {
+ User user = emailAddress.getOwner();
+ user.getEmailAddresses().remove(emailAddress);
+ if (!user.getSortedEmailAddresses().isEmpty()) {
+ EmailAddress firstEmailAddress = user.getSortedEmailAddresses().iterator().next();
+ if (emailAddress.isPrimary())
+ firstEmailAddress.setPrimary(true);
+ if (emailAddress.isGit())
+ firstEmailAddress.setGit(true);
+ dao.persist(firstEmailAddress);
+ }
}
}
@@ -120,7 +151,7 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
emailAddress.setPrimary(true);
emailAddress.setGit(true);
}
- super.save(emailAddress);
+ dao.persist(emailAddress);
user.getEmailAddresses().add(emailAddress);
@@ -148,24 +179,35 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
@Listen
public void on(EntityRemoved event) {
if (event.getEntity() instanceof EmailAddress) {
- String value = ((EmailAddress)event.getEntity()).getValue();
+ Long id = event.getEntity().getId();
transactionManager.runAfterCommit(new Runnable() {
@Override
public void run() {
- idCache.remove(value);
+ cacheLock.writeLock().lock();
+ try {
+ cache.remove(id);
+ } finally {
+ cacheLock.writeLock().unlock();
+ }
}
});
} else if (event.getEntity() instanceof User) {
- User user = (User) event.getEntity();
- Collection<String> values = user.getEmailAddresses().stream()
- .map(it->it.getValue()).collect(Collectors.toList());
+ Long ownerId = event.getEntity().getId();
transactionManager.runAfterCommit(new Runnable() {
@Override
public void run() {
- idCache.keySet().removeAll(values);
+ cacheLock.writeLock().lock();
+ try {
+ for (Iterator<Map.Entry<Long, EmailAddressFacade>> it = cache.entrySet().iterator(); it.hasNext();) {
+ if (it.next().getValue().getOwnerId().equals(ownerId))
+ it.remove();
+ }
+ } finally {
+ cacheLock.writeLock().unlock();
+ }
}
});
@@ -176,14 +218,17 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
@Listen
public void on(EntityPersisted event) {
if (event.getEntity() instanceof EmailAddress) {
- EmailAddress emailAddress = (EmailAddress) event.getEntity();
- String value = emailAddress.getValue();
- Long id = emailAddress.getId();
+ EmailAddressFacade facade = ((EmailAddress) event.getEntity()).getFacade();
transactionManager.runAfterCommit(new Runnable() {
@Override
public void run() {
- idCache.put(value, id);
+ cacheLock.writeLock().lock();
+ try {
+ cache.put(facade.getId(), facade);
+ } finally {
+ cacheLock.writeLock().unlock();
+ }
}
});
@@ -200,7 +245,7 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
String serverUrl = settingManager.getSystemSetting().getServerUrl();
String verificationUrl = String.format("%s/verify-email-address/%d/%s",
- serverUrl, emailAddress.getId(), emailAddress.getVerficationCode());
+ serverUrl, emailAddress.getId(), emailAddress.getVerificationCode());
String htmlBody = String.format("Hello,"
+ "<p style='margin: 16px 0;'>"
+ "The account \"%s\" at \"%s\" tries to use email address '%s', please visit below link to verify if this is you:<br><br>"
@@ -219,5 +264,38 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
"[Verification] Please Verify Your Email Address",
htmlBody, textBody, null, null);
}
+
+ @Override
+ public EmailAddress findPrimary(User user) {
+ cacheLock.readLock().lock();
+ try {
+ EmailAddressFacade facade = cache.findPrimary(user);
+ if (facade != null)
+ return load(facade.getId());
+ else
+ return null;
+ } finally {
+ cacheLock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public EmailAddress findGit(User user) {
+ cacheLock.readLock().lock();
+ try {
+ EmailAddressFacade facade = cache.findGit(user);
+ if (facade != null)
+ return load(facade.getId());
+ else
+ return null;
+ } finally {
+ cacheLock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public EmailAddressFacades getCache() {
+ return cache.clone();
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
index c367c5e753..7aa704002e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
@@ -123,4 +123,13 @@ public class DefaultGroupManager extends BaseEntityManager<Group> implements Gro
return count(getCriteria(term));
}
+ @Sessional
+ @Override
+ public List<Group> queryAdminstrator() {
+ EntityCriteria<Group> criteria = EntityCriteria.of(Group.class);
+ criteria.add(Restrictions.eq(Group.PROP_ADMINISTRATOR, true));
+ criteria.setCacheable(true);
+ return query(criteria);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueAuthorizationManager.java
index 4df2493e26..bdb9908789 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueAuthorizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueAuthorizationManager.java
@@ -5,16 +5,13 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.hibernate.criterion.Restrictions;
-
import io.onedev.server.entitymanager.IssueAuthorizationManager;
-import io.onedev.server.model.IssueAuthorization;
import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueAuthorization;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
public class DefaultIssueAuthorizationManager extends BaseEntityManager<IssueAuthorization>
@@ -54,12 +51,4 @@ public class DefaultIssueAuthorizationManager extends BaseEntityManager<IssueAut
}
}
- @Override
- public IssueAuthorization find(Issue issue, User user) {
- EntityCriteria<IssueAuthorization> criteria = EntityCriteria.of(IssueAuthorization.class);
- criteria.add(Restrictions.eq(IssueAuthorization.PROP_ISSUE, issue));
- criteria.add(Restrictions.eq(IssueAuthorization.PROP_USER, user));
- return find(criteria);
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index 481f6aa6c9..f660921d58 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -79,6 +79,7 @@ import io.onedev.server.model.support.issue.transitiontrigger.StateTransitionTri
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;
+import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
@@ -115,6 +116,8 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
private final TransactionManager transactionManager;
+ private final SessionManager sessionManager;
+
private final ProjectManager projectManager;
private final PullRequestManager pullRequestManager;
@@ -139,7 +142,8 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
ProjectManager projectManager, BuildManager buildManager,
ExecutorService executorService, PullRequestManager pullRequestManager,
ListenerRegistry listenerRegistry, TaskScheduler taskScheduler,
- IssueScheduleManager issueScheduleManager, IssueLinkManager issueLinkManager) {
+ IssueScheduleManager issueScheduleManager, IssueLinkManager issueLinkManager,
+ SessionManager sessionManager) {
super(dao);
this.issueManager = issueManager;
this.issueFieldManager = issueFieldManager;
@@ -152,6 +156,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
this.taskScheduler = taskScheduler;
this.issueScheduleManager = issueScheduleManager;
this.issueLinkManager = issueLinkManager;
+ this.sessionManager = sessionManager;
}
@Transactional
@@ -167,8 +172,23 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
dao.persist(comment);
comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()+1);
}
-
- listenerRegistry.post(new IssueChanged(change, note));
+
+ Long changeId = change.getId();
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ sessionManager.runAsync(new Runnable() {
+
+ @Override
+ public void run() {
+ listenerRegistry.post(new IssueChanged(load(changeId), note));
+ }
+
+ });
+ }
+
+ });
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
index a519829527..0d51cdbdb8 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
@@ -11,6 +11,8 @@ import io.onedev.commons.loader.ListenerRegistry;
import io.onedev.server.entitymanager.IssueCommentManager;
import io.onedev.server.event.issue.IssueCommented;
import io.onedev.server.model.IssueComment;
+import io.onedev.server.persistence.SessionManager;
+import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@@ -21,10 +23,17 @@ public class DefaultIssueCommentManager extends BaseEntityManager<IssueComment>
private final ListenerRegistry listenerRegistry;
+ private final TransactionManager transactionManager;
+
+ private final SessionManager sessionManager;
+
@Inject
- public DefaultIssueCommentManager(Dao dao, ListenerRegistry listenerRegistry) {
+ public DefaultIssueCommentManager(Dao dao, ListenerRegistry listenerRegistry,
+ TransactionManager transactionManager, SessionManager sessionManager) {
super(dao);
this.listenerRegistry = listenerRegistry;
+ this.transactionManager = transactionManager;
+ this.sessionManager = sessionManager;
}
@Transactional
@@ -40,14 +49,30 @@ public class DefaultIssueCommentManager extends BaseEntityManager<IssueComment>
comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()-1);
}
+ @Transactional
@Override
public void save(IssueComment comment, Collection<String> notifiedEmailAddresses) {
boolean isNew = comment.isNew();
dao.persist(comment);
if (isNew) {
- IssueCommented event = new IssueCommented(comment, notifiedEmailAddresses);
- listenerRegistry.post(event);
comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()+1);
+
+ Long commentId = comment.getId();
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ sessionManager.runAsync(new Runnable() {
+
+ @Override
+ public void run() {
+ listenerRegistry.post(new IssueCommented(load(commentId), notifiedEmailAddresses));
+ }
+
+ });
+ }
+
+ });
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 24b7c4d2b7..035f48b8d5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -12,6 +12,7 @@ import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.inject.Inject;
@@ -76,6 +77,7 @@ import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.server.model.support.issue.changedata.IssueChangeData;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
+import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
@@ -152,6 +154,8 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
private final IssueLinkManager linkManager;
+ private final SessionManager sessionManager;
+
private final Map<Long, Map<Long, Long>> idCache = new HashMap<>();
private final ReadWriteLock idCacheLock = new ReentrantReadWriteLock();
@@ -164,7 +168,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
RoleManager roleManager, AttachmentStorageManager attachmentStorageManager,
IssueCommentManager commentManager, EntityReferenceManager entityReferenceManager,
LinkSpecManager linkSpecManager, IssueLinkManager linkManager,
- IssueAuthorizationManager authorizationManager) {
+ IssueAuthorizationManager authorizationManager, SessionManager sessionManager) {
super(dao);
this.fieldManager = fieldManager;
this.queryPersonalizationManager = queryPersonalizationManager;
@@ -180,6 +184,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
this.commentManager = commentManager;
this.entityReferenceManager = entityReferenceManager;
this.authorizationManager = authorizationManager;
+ this.sessionManager = sessionManager;
}
@SuppressWarnings("unchecked")
@@ -243,8 +248,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
issue.setNumberScope(issue.getProject().getForkRoot());
issue.setNumber(getNextNumber(issue.getNumberScope()));
- IssueOpened event = new IssueOpened(issue);
- issue.setLastUpdate(event.getLastUpdate());
+ issue.setLastUpdate(new IssueOpened(issue).getLastUpdate());
save(issue);
@@ -258,7 +262,23 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
issue.getAuthorizations().add(authorization);
authorizationManager.save(authorization);
- listenerRegistry.post(event);
+ Long issueId = issue.getId();
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ sessionManager.runAsync(new Runnable() {
+
+ @Override
+ public void run() {
+ listenerRegistry.post(new IssueOpened(load(issueId)));
+ }
+
+ });
+ }
+
+ });
+
}
@Transactional
@@ -392,8 +412,9 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
}
predicates.add(builder.or(projectPredicates.toArray(new Predicate[0])));
} else if (!SecurityUtils.isAdministrator()) {
- Collection<Long> projectIds = projectManager.getPermittedProjects(new AccessProject()).getIds();
- if (!projectIds.isEmpty()) {
+ Collection<Project> projects = projectManager.getPermittedProjects(new AccessProject());
+ if (!projects.isEmpty()) {
+ Collection<Long> projectIds = projects.stream().map(it->it.getId()).collect(Collectors.toSet());
predicates.add(builder.or(
getPredicate(builder, root, projectIds),
getAuthorizationPredicate(query, builder, root, projectIds)));
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 4a016ef146..c4ec823530 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -7,7 +7,6 @@ import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -17,6 +16,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.inject.Inject;
@@ -101,10 +101,9 @@ import io.onedev.server.search.entity.issue.IssueQueryUpdater;
import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessProject;
-import io.onedev.server.util.ProjectCache;
-import io.onedev.server.util.ProjectCollection;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.facade.ProjectFacade;
+import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.schedule.SchedulableTask;
import io.onedev.server.util.schedule.TaskScheduler;
@@ -149,7 +148,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
private final Map<Long, Date> updateDates = new ConcurrentHashMap<>();
- private final ProjectCache cache = new ProjectCache(new HashMap<>());
+ private final ProjectCache cache = new ProjectCache();
private final ReadWriteLock cacheLock = new ReentrantReadWriteLock();
@@ -292,7 +291,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
public void run() {
cacheLock.writeLock().lock();
try {
- cache.cache(facade);
+ cache.put(facade.getId(), facade);
} finally {
cacheLock.writeLock().unlock();
}
@@ -384,7 +383,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
cacheLock.readLock().lock();
try {
Long projectId = null;
- for (ProjectFacade facade: cache.getAll()) {
+ for (ProjectFacade facade: cache.values()) {
if (serviceDeskName.equals(facade.getServiceDeskName())) {
projectId = facade.getId();
break;
@@ -441,7 +440,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
cacheLock.readLock().lock();
try {
Long projectId = null;
- for (ProjectFacade facade: cache.getAll()) {
+ for (ProjectFacade facade: cache.values()) {
if (facade.getName().equalsIgnoreCase(name)
&& Objects.equals(Project.idOf(parent), facade.getParentId())) {
projectId = facade.getId();
@@ -661,7 +660,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
cacheLock.writeLock().lock();
try {
for (Project project: query()) {
- cache.cache(project.getFacade());
+ cache.put(project.getId(), project.getFacade());
checkSanity(project);
}
} finally {
@@ -780,7 +779,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
}
@Override
- public ProjectCollection getPermittedProjects(Permission permission) {
+ public Collection<Project> getPermittedProjects(Permission permission) {
ProjectCache cacheClone;
cacheLock.readLock().lock();
try {
@@ -793,12 +792,12 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
User user = SecurityUtils.getUser();
if (user != null) {
if (user.isRoot() || user.isSystem()) {
- return new ProjectCollection(cacheClone, new ArrayList<>(cacheClone.getIds()));
+ return cacheClone.getProjects();
} else {
permittedProjectIds = new HashSet<>();
for (Group group: user.getGroups()) {
if (group.isAdministrator())
- return new ProjectCollection(cacheClone, new ArrayList<>(cacheClone.getIds()));
+ return cacheClone.getProjects();
for (GroupAuthorization authorization: group.getAuthorizations()) {
if (authorization.getRole().implies(permission))
addSubTreeIds(permittedProjectIds, authorization.getProject());
@@ -807,7 +806,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
Group defaultLoginGroup = settingManager.getSecuritySetting().getDefaultLoginGroup();
if (defaultLoginGroup != null) {
if (defaultLoginGroup.isAdministrator())
- return new ProjectCollection(cacheClone, new ArrayList<>(cacheClone.getIds()));
+ return cacheClone.getProjects();
for (GroupAuthorization authorization: defaultLoginGroup.getAuthorizations()) {
if (authorization.getRole().implies(permission))
addSubTreeIds(permittedProjectIds, authorization.getProject());
@@ -825,13 +824,13 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
if (settingManager.getSecuritySetting().isEnableAnonymousAccess())
addIdsPermittedByDefaultRole(cacheClone, permittedProjectIds, permission);
}
- permittedProjectIds.retainAll(cacheClone.getIds());
- return new ProjectCollection(cacheClone, new ArrayList<>(permittedProjectIds));
+
+ return permittedProjectIds.stream().map(it->load(it)).collect(Collectors.toSet());
}
private void addIdsPermittedByDefaultRole(ProjectCache cache, Collection<Long> projectIds,
Permission permission) {
- for (ProjectFacade project: cache.getAll()) {
+ for (ProjectFacade project: cache.values()) {
if (project.getDefaultRoleId() != null) {
Role defaultRole = roleManager.load(project.getDefaultRoleId());
if (defaultRole.implies(permission))
@@ -867,10 +866,10 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
From<Project, Project> from, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
if (!SecurityUtils.isAdministrator()) {
- ProjectCollection collection = getPermittedProjects(new AccessProject());
- if (!collection.getIds().isEmpty()) {
+ Collection<Project> projects = getPermittedProjects(new AccessProject());
+ if (!projects.isEmpty()) {
predicates.add(Criteria.forManyValues(builder, from.get(Project.PROP_ID),
- collection.getIds(), collection.getCache().getIds()));
+ projects.stream().map(it->it.getId()).collect(Collectors.toSet()), getIds()));
} else {
predicates.add(builder.disjunction());
}
@@ -947,7 +946,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
public Collection<Long> getIds() {
cacheLock.readLock().lock();
try {
- return new HashSet<>(cache.getIds());
+ return new HashSet<>(cache.keySet());
} finally {
cacheLock.readLock().unlock();
}
@@ -958,7 +957,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
cacheLock.readLock().lock();
try {
return Criteria.forManyValues(builder, path.get(Project.PROP_ID),
- cache.getMatchingIds(pathPattern), cache.getIds());
+ cache.getMatchingIds(pathPattern), cache.keySet());
} finally {
cacheLock.readLock().unlock();
}
@@ -1000,5 +999,15 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
cacheLock.readLock().unlock();
}
}
+
+ @Override
+ public ProjectCache cloneCache() {
+ cacheLock.readLock().lock();
+ try {
+ return cache.clone();
+ } finally {
+ cacheLock.readLock().unlock();
+ }
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 55c0bf6351..8a430868dc 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -128,7 +128,6 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.ProjectAndBranch;
-import io.onedev.server.util.ProjectCollection;
import io.onedev.server.util.ProjectPullRequestStats;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.concurrent.BatchWorkManager;
@@ -734,7 +733,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
* can not lock the check method directly as the lock should be put outside
* of transaction
*/
- LockUtils.call("request-" + requestId + "-check", new Callable<Void>() {
+ LockUtils.call(PullRequest.getSerialLockName(requestId), true, new Callable<Void>() {
@Override
public Void call() throws Exception {
@@ -888,11 +887,12 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
if (targetProject != null) {
predicates.add(builder.equal(from.get(PullRequest.PROP_TARGET_PROJECT), targetProject));
} else if (!SecurityUtils.isAdministrator()) {
- ProjectCollection projects = projectManager.getPermittedProjects(new ReadCode());
- if (!projects.getIds().isEmpty()) {
+ Collection<Project> projects = projectManager.getPermittedProjects(new ReadCode());
+ if (!projects.isEmpty()) {
Path<Long> projectIdPath = from.get(PullRequest.PROP_TARGET_PROJECT).get(Project.PROP_ID);
- predicates.add(Criteria.forManyValues(builder, projectIdPath, projects.getIds(),
- projects.getCache().getIds()));
+ predicates.add(Criteria.forManyValues(builder, projectIdPath,
+ projects.stream().map(it->it.getId()).collect(Collectors.toSet()),
+ projectManager.getIds()));
} else {
predicates.add(builder.disjunction());
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index 08a181581a..246d3d5237 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -4,10 +4,9 @@ import static io.onedev.server.model.User.PROP_PASSWORD;
import static io.onedev.server.model.User.PROP_SSO_CONNECTOR;
import java.util.Collection;
-import java.util.Comparator;
import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -17,12 +16,16 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
+import org.apache.shiro.authz.Permission;
import org.hibernate.ReplicationMode;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
+import com.google.common.collect.Sets;
+
import io.onedev.commons.loader.Listen;
import io.onedev.server.entitymanager.EmailAddressManager;
+import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -32,8 +35,12 @@ import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.EmailAddress;
+import io.onedev.server.model.Group;
+import io.onedev.server.model.GroupAuthorization;
+import io.onedev.server.model.IssueAuthorization;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
+import io.onedev.server.model.UserAuthorization;
import io.onedev.server.model.support.BranchProtection;
import io.onedev.server.model.support.TagProtection;
import io.onedev.server.persistence.IdManager;
@@ -43,6 +50,9 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
+import io.onedev.server.security.permission.ConfidentialIssuePermission;
+import io.onedev.server.util.facade.UserCache;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.usage.Usage;
@Singleton
@@ -58,13 +68,17 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
private final EmailAddressManager emailAddressManager;
+ private final GroupManager groupManager;
+
private final TransactionManager transactionManager;
- private final Map<String, Long> idCache = new ConcurrentHashMap<>();
+ private final UserCache cache = new UserCache();
+
+ private final ReadWriteLock cacheLock = new ReentrantReadWriteLock();
@Inject
public DefaultUserManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,
- IssueFieldManager issueFieldManager, IdManager idManager,
+ IssueFieldManager issueFieldManager, IdManager idManager, GroupManager groupManager,
EmailAddressManager emailAddressManager, TransactionManager transactionManager) {
super(dao);
@@ -74,6 +88,7 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
this.idManager = idManager;
this.emailAddressManager = emailAddressManager;
this.transactionManager = transactionManager;
+ this.groupManager = groupManager;
}
@Transactional
@@ -81,6 +96,7 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
public void replicate(User user) {
getSession().replicate(user, ReplicationMode.OVERWRITE);
idManager.useId(User.class, user.getId());
+ cacheAfterCommit(user);
}
@Transactional
@@ -223,32 +239,46 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
@Sessional
@Override
public User findByName(String userName) {
- userName = userName.toLowerCase();
- Long id = idCache.get(userName);
- if (id != null) {
- User user = get(id);
- if (user != null && user.getName().equals(userName))
- return user;
+ cacheLock.readLock().lock();
+ try {
+ UserFacade facade = cache.findByName(userName);
+ if (facade != null)
+ return load(facade.getId());
+ else
+ return null;
+ } finally {
+ cacheLock.readLock().unlock();
}
- return null;
}
@Sessional
@Override
public User findByFullName(String fullName) {
- EntityCriteria<User> criteria = newCriteria();
- criteria.add(Restrictions.ilike(User.PROP_FULL_NAME, fullName));
- criteria.setCacheable(true);
- return find(criteria);
+ cacheLock.readLock().lock();
+ try {
+ UserFacade facade = cache.findByFullName(fullName);
+ if (facade != null)
+ return load(facade.getId());
+ else
+ return null;
+ } finally {
+ cacheLock.readLock().unlock();
+ }
}
@Sessional
@Override
public User findByAccessToken(String accessToken) {
- EntityCriteria<User> criteria = newCriteria();
- criteria.add(Restrictions.eq(User.PROP_ACCESS_TOKEN, accessToken));
- criteria.setCacheable(true);
- return find(criteria);
+ cacheLock.readLock().lock();
+ try {
+ UserFacade facade = cache.findByAccessToken(accessToken);
+ if (facade != null)
+ return load(facade.getId());
+ else
+ return null;
+ } finally {
+ cacheLock.readLock().unlock();
+ }
}
@Override
@@ -264,33 +294,33 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
return count(true);
}
- @Override
- public List<User> queryAndSort(Collection<User> topUsers) {
- List<User> users = query();
- users.sort(Comparator.comparing(User::getDisplayName));
- users.removeAll(topUsers);
- users.addAll(0, topUsers);
- return users;
- }
-
@Sessional
@Listen
public void on(SystemStarted event) {
- for (User user: query())
- idCache.put(user.getName(), user.getId());
+ cacheLock.writeLock().lock();
+ try {
+ for (User user: query())
+ cache.put(user.getId(), user.getFacade());
+ } finally {
+ cacheLock.writeLock().unlock();
+ }
}
@Transactional
@Listen
public void on(EntityRemoved event) {
if (event.getEntity() instanceof User) {
- User user = (User) event.getEntity();
- String name = user.getName();
+ Long id = event.getEntity().getId();
transactionManager.runAfterCommit(new Runnable() {
@Override
public void run() {
- idCache.remove(name);
+ cacheLock.writeLock().lock();
+ try {
+ cache.remove(id);
+ } finally {
+ cacheLock.writeLock().unlock();
+ }
}
});
@@ -300,19 +330,25 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
@Transactional
@Listen
public void on(EntityPersisted event) {
- if (event.getEntity() instanceof User) {
- User user = (User) event.getEntity();
- String name = user.getName();
- Long id = user.getId();
- transactionManager.runAfterCommit(new Runnable() {
+ if (event.getEntity() instanceof User)
+ cacheAfterCommit((User) event.getEntity());
+ }
+
+ private void cacheAfterCommit(User user) {
+ UserFacade facade = user.getFacade();
+ transactionManager.runAfterCommit(new Runnable() {
- @Override
- public void run() {
- idCache.put(name, id);
- }
-
- });
- }
+ @Override
+ public void run() {
+ cacheLock.writeLock().lock();
+ try {
+ cache.put(facade.getId(), facade);
+ } finally {
+ cacheLock.writeLock().unlock();
+ }
+ }
+
+ });
}
@Transactional
@@ -395,4 +431,66 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
return null;
}
+ @Override
+ public UserCache cloneCache() {
+ cacheLock.readLock().lock();
+ try {
+ return cache.clone();
+ } finally {
+ cacheLock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public Collection<User> getAuthorizedUsers(Project project, Permission permission) {
+ UserCache cacheClone;
+ cacheLock.readLock().lock();
+ try {
+ cacheClone = cache.clone();
+ } finally {
+ cacheLock.readLock().unlock();
+ }
+
+ Collection<User> authorizedUsers = Sets.newHashSet(getRoot());
+
+ Group defaultLoginGroup = settingManager.getSecuritySetting().getDefaultLoginGroup();
+ if (defaultLoginGroup != null && defaultLoginGroup.isAdministrator())
+ return cacheClone.getUsers();
+
+ for (Group group: groupManager.queryAdminstrator()) {
+ for (User user: group.getMembers())
+ authorizedUsers.add(user);
+ }
+
+ Project current = project;
+ do {
+ if (current.getDefaultRole() != null && current.getDefaultRole().implies(permission))
+ return cacheClone.getUsers();
+
+ for (UserAuthorization authorization: current.getUserAuthorizations()) {
+ if (authorization.getRole().implies(permission))
+ authorizedUsers.add(authorization.getUser());
+ }
+
+ for (GroupAuthorization authorization: current.getGroupAuthorizations()) {
+ if (authorization.getRole().implies(permission)) {
+ if (authorization.getGroup().equals(defaultLoginGroup))
+ return cacheClone.getUsers();
+
+ for (User user: authorization.getGroup().getMembers())
+ authorizedUsers.add(user);
+ }
+ }
+ current = current.getParent();
+ } while (current != null);
+
+ if (permission instanceof ConfidentialIssuePermission) {
+ ConfidentialIssuePermission confidentialIssuePermission = (ConfidentialIssuePermission) permission;
+ for (IssueAuthorization authorization: confidentialIssuePermission.getIssue().getAuthorizations())
+ authorizedUsers.add(authorization.getUser());
+ }
+
+ return authorizedUsers;
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/event/Event.java b/server-core/src/main/java/io/onedev/server/event/Event.java
index b2e4d16cb1..440bda246d 100644
--- a/server-core/src/main/java/io/onedev/server/event/Event.java
+++ b/server-core/src/main/java/io/onedev/server/event/Event.java
@@ -29,5 +29,5 @@ public abstract class Event {
public Date getDate() {
return date;
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java
index d5b0762fd0..f196190551 100644
--- a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java
@@ -7,10 +7,11 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.CommitAware;
import io.onedev.server.util.ProjectScopedCommit;
-public class BuildEvent extends ProjectEvent implements CommitAware {
+public abstract class BuildEvent extends ProjectEvent implements CommitAware {
private Build build;
@@ -37,4 +38,6 @@ public class BuildEvent extends ProjectEvent implements CommitAware {
return build.getStatus().toString();
}
+ public abstract BuildEvent cloneIn(Dao dao);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildFinished.java b/server-core/src/main/java/io/onedev/server/event/build/BuildFinished.java
index 3c240749ec..21e020e556 100644
--- a/server-core/src/main/java/io/onedev/server/event/build/BuildFinished.java
+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildFinished.java
@@ -1,6 +1,7 @@
package io.onedev.server.event.build;
import io.onedev.server.model.Build;
+import io.onedev.server.persistence.dao.Dao;
public class BuildFinished extends BuildEvent {
@@ -8,4 +9,9 @@ public class BuildFinished extends BuildEvent {
super(null, build.getFinishDate(), build);
}
+ @Override
+ public BuildEvent cloneIn(Dao dao) {
+ return new BuildFinished(dao.load(Build.class, getBuild().getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildPending.java b/server-core/src/main/java/io/onedev/server/event/build/BuildPending.java
index 7adf80d4db..571a9f948e 100644
--- a/server-core/src/main/java/io/onedev/server/event/build/BuildPending.java
+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildPending.java
@@ -1,6 +1,7 @@
package io.onedev.server.event.build;
import io.onedev.server.model.Build;
+import io.onedev.server.persistence.dao.Dao;
public class BuildPending extends BuildEvent {
@@ -8,4 +9,9 @@ public class BuildPending extends BuildEvent {
super(null, build.getPendingDate(), build);
}
+ @Override
+ public BuildEvent cloneIn(Dao dao) {
+ return new BuildPending(dao.load(Build.class, getBuild().getId()));
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildRetrying.java b/server-core/src/main/java/io/onedev/server/event/build/BuildRetrying.java
index d69172e056..cd29c5f0df 100644
--- a/server-core/src/main/java/io/onedev/server/event/build/BuildRetrying.java
+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildRetrying.java
@@ -1,6 +1,7 @@
package io.onedev.server.event.build;
import io.onedev.server.model.Build;
+import io.onedev.server.persistence.dao.Dao;
public class BuildRetrying extends BuildEvent {
@@ -8,4 +9,9 @@ public class BuildRetrying extends BuildEvent {
super(build.getSubmitter(), build.getRetryDate(), build);
}
+ @Override
+ public BuildEvent cloneIn(Dao dao) {
+ return new BuildRetrying(dao.load(Build.class, getBuild().getId()));
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildRunning.java b/server-core/src/main/java/io/onedev/server/event/build/BuildRunning.java
index cd4573184f..87ca35c10b 100644
--- a/server-core/src/main/java/io/onedev/server/event/build/BuildRunning.java
+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildRunning.java
@@ -1,6 +1,7 @@
package io.onedev.server.event.build;
import io.onedev.server.model.Build;
+import io.onedev.server.persistence.dao.Dao;
public class BuildRunning extends BuildEvent {
@@ -8,4 +9,9 @@ public class BuildRunning extends BuildEvent {
super(null, build.getRunningDate(), build);
}
+ @Override
+ public BuildEvent cloneIn(Dao dao) {
+ return new BuildRunning(dao.load(Build.class, getBuild().getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildSubmitted.java b/server-core/src/main/java/io/onedev/server/event/build/BuildSubmitted.java
index 21f20abe94..14d050301e 100644
--- a/server-core/src/main/java/io/onedev/server/event/build/BuildSubmitted.java
+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildSubmitted.java
@@ -1,6 +1,7 @@
package io.onedev.server.event.build;
import io.onedev.server.model.Build;
+import io.onedev.server.persistence.dao.Dao;
public class BuildSubmitted extends BuildEvent {
@@ -8,4 +9,9 @@ public class BuildSubmitted extends BuildEvent {
super(build.getSubmitter(), build.getSubmitDate(), build);
}
+ @Override
+ public BuildEvent cloneIn(Dao dao) {
+ return new BuildSubmitted(dao.load(Build.class, getBuild().getId()));
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildUpdated.java b/server-core/src/main/java/io/onedev/server/event/build/BuildUpdated.java
index 597196f38b..fa0556399e 100644
--- a/server-core/src/main/java/io/onedev/server/event/build/BuildUpdated.java
+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildUpdated.java
@@ -3,6 +3,7 @@ package io.onedev.server.event.build;
import java.util.Date;
import io.onedev.server.model.Build;
+import io.onedev.server.persistence.dao.Dao;
public class BuildUpdated extends BuildEvent {
@@ -10,4 +11,9 @@ public class BuildUpdated extends BuildEvent {
super(null, new Date(), build);
}
+ @Override
+ public BuildEvent cloneIn(Dao dao) {
+ return new BuildUpdated(dao.load(Build.class, getBuild().getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java
index 0e64dba9d1..d5d52308fc 100644
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java
+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java
@@ -1,6 +1,7 @@
package io.onedev.server.event.codecomment;
import io.onedev.server.model.CodeComment;
+import io.onedev.server.persistence.dao.Dao;
public class CodeCommentCreated extends CodeCommentEvent {
@@ -18,4 +19,9 @@ public class CodeCommentCreated extends CodeCommentEvent {
return "added";
}
+ @Override
+ public CodeCommentEvent cloneIn(Dao dao) {
+ return new CodeCommentCreated(dao.load(CodeComment.class, getComment().getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java
index 2b2362cc0e..a49f6cac72 100644
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java
@@ -5,6 +5,7 @@ import java.util.Date;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.Dao;
public abstract class CodeCommentEvent extends ProjectEvent {
@@ -24,4 +25,5 @@ public abstract class CodeCommentEvent extends ProjectEvent {
return comment;
}
+ public abstract CodeCommentEvent cloneIn(Dao dao);
}
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
index cca034ceca..f859ce8c90 100644
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
@@ -1,6 +1,7 @@
package io.onedev.server.event.codecomment;
import io.onedev.server.model.CodeCommentReply;
+import io.onedev.server.persistence.dao.Dao;
public class CodeCommentReplied extends CodeCommentEvent {
@@ -25,4 +26,9 @@ public class CodeCommentReplied extends CodeCommentEvent {
return "replied";
}
+ @Override
+ public CodeCommentEvent cloneIn(Dao dao) {
+ return new CodeCommentReplied(dao.load(CodeCommentReply.class, reply.getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.java
index 8b8acc7763..5bd1cf7ef8 100644
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.java
@@ -3,6 +3,7 @@ package io.onedev.server.event.codecomment;
import javax.annotation.Nullable;
import io.onedev.server.model.CodeCommentStatusChange;
+import io.onedev.server.persistence.dao.Dao;
public class CodeCommentStatusChanged extends CodeCommentEvent {
@@ -38,4 +39,9 @@ public class CodeCommentStatusChanged extends CodeCommentEvent {
return "unresolved";
}
+ @Override
+ public CodeCommentEvent cloneIn(Dao dao) {
+ return new CodeCommentStatusChanged(dao.load(CodeCommentStatusChange.class, change.getId()), note);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java
index abe3edddcf..c982addb7d 100644
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java
+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java
@@ -4,6 +4,7 @@ import java.util.Date;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.Dao;
public class CodeCommentUpdated extends CodeCommentEvent {
@@ -21,4 +22,11 @@ public class CodeCommentUpdated extends CodeCommentEvent {
return "updated";
}
+ @Override
+ public CodeCommentEvent cloneIn(Dao dao) {
+ return new CodeCommentUpdated(
+ dao.load(User.class, getUser().getId()),
+ dao.load(CodeComment.class, getComment().getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java
index e1ab4c4374..2864e53b01 100644
--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java
@@ -9,6 +9,7 @@ import io.onedev.server.model.Group;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
import io.onedev.server.notification.ActivityDetail;
+import io.onedev.server.persistence.dao.Dao;
public class IssueChanged extends IssueEvent {
@@ -61,4 +62,9 @@ public class IssueChanged extends IssueEvent {
return getChange().getData().getActivityDetail();
}
+ @Override
+ public IssueEvent cloneIn(Dao dao) {
+ return new IssueChanged(dao.load(IssueChange.class, change.getId()), comment);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
index 78a1f8879b..6198d50c0c 100644
--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
@@ -3,6 +3,7 @@ package io.onedev.server.event.issue;
import java.util.Collection;
import io.onedev.server.model.IssueComment;
+import io.onedev.server.persistence.dao.Dao;
public class IssueCommented extends IssueEvent {
@@ -39,4 +40,9 @@ public class IssueCommented extends IssueEvent {
return "commented";
}
+ @Override
+ public IssueEvent cloneIn(Dao dao) {
+ return new IssueCommented(dao.load(IssueComment.class, comment.getId()), notifiedEmailAddresses);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.java
index 2b7d6e9442..76453225ca 100644
--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.java
@@ -9,6 +9,7 @@ import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.Dao;
public abstract class IssueEvent extends ProjectEvent {
@@ -33,4 +34,6 @@ public abstract class IssueEvent extends ProjectEvent {
return new HashMap<>();
}
+ public abstract IssueEvent cloneIn(Dao dao);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
index a2956fabeb..939dfb8d9d 100644
--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
@@ -13,6 +13,7 @@ import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
+import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.Input;
public class IssueOpened extends IssueEvent {
@@ -70,4 +71,9 @@ public class IssueOpened extends IssueEvent {
return "opened";
}
+ @Override
+ public IssueEvent cloneIn(Dao dao) {
+ return new IssueOpened(dao.load(Issue.class, getIssue().getId()));
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestAssigned.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestAssigned.java
index 18569819f1..b44a8aaeb7 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestAssigned.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestAssigned.java
@@ -6,6 +6,7 @@ import javax.annotation.Nullable;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.Dao;
public class PullRequestAssigned extends PullRequestEvent {
@@ -25,5 +26,14 @@ public class PullRequestAssigned extends PullRequestEvent {
public User getAssignee() {
return assignee;
}
+
+ @Override
+ public PullRequestEvent cloneIn(Dao dao) {
+ return new PullRequestAssigned(
+ dao.load(User.class, getUser().getId()),
+ getDate(),
+ dao.load(PullRequest.class, getRequest().getId()),
+ dao.load(User.class, assignee.getId()));
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java
index 7c61e5506f..2a1f02d1a8 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java
@@ -3,6 +3,7 @@ package io.onedev.server.event.pullrequest;
import java.util.Date;
import io.onedev.server.model.Build;
+import io.onedev.server.persistence.dao.Dao;
public class PullRequestBuildEvent extends PullRequestEvent {
@@ -28,4 +29,9 @@ public class PullRequestBuildEvent extends PullRequestEvent {
return activity;
}
+ @Override
+ public PullRequestEvent cloneIn(Dao dao) {
+ return new PullRequestBuildEvent(dao.load(Build.class, build.getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java
index 2532e9fee4..291234d354 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java
@@ -8,6 +8,7 @@ import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
+import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.CommitAware;
import io.onedev.server.util.ProjectScopedCommit;
@@ -59,4 +60,9 @@ public class PullRequestChanged extends PullRequestEvent implements CommitAware
return new ProjectScopedCommit(getProject(), commitId);
}
+ @Override
+ public PullRequestEvent cloneIn(Dao dao) {
+ return new PullRequestChanged(dao.load(PullRequestChange.class, change.getId()), note);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java
index 11c0e63a22..846ddf22fe 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java
@@ -2,6 +2,7 @@ package io.onedev.server.event.pullrequest;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.persistence.dao.Dao;
public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent {
@@ -19,4 +20,11 @@ public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent {
return "created code comment";
}
+ @Override
+ public PullRequestEvent cloneIn(Dao dao) {
+ return new PullRequestCodeCommentCreated(
+ dao.load(PullRequest.class, getRequest().getId()),
+ dao.load(CodeComment.class, getComment().getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java
index 6e10d633b2..1a267d59ee 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java
@@ -2,6 +2,7 @@ package io.onedev.server.event.pullrequest;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.persistence.dao.Dao;
public class PullRequestCodeCommentReplied extends PullRequestCodeCommentEvent {
@@ -26,4 +27,11 @@ public class PullRequestCodeCommentReplied extends PullRequestCodeCommentEvent {
return "replied code comment";
}
+ @Override
+ public PullRequestEvent cloneIn(Dao dao) {
+ return new PullRequestCodeCommentReplied(
+ dao.load(PullRequest.class, getRequest().getId()),
+ dao.load(CodeCommentReply.class, reply.getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentStatusChanged.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentStatusChanged.java
index 077f5d06f5..b2655ca79e 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentStatusChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentStatusChanged.java
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import io.onedev.server.model.CodeCommentStatusChange;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.persistence.dao.Dao;
public class PullRequestCodeCommentStatusChanged extends PullRequestCodeCommentEvent {
@@ -11,7 +12,8 @@ public class PullRequestCodeCommentStatusChanged extends PullRequestCodeCommentE
private final String note;
- public PullRequestCodeCommentStatusChanged(PullRequest request, CodeCommentStatusChange change, @Nullable String note) {
+ public PullRequestCodeCommentStatusChanged(PullRequest request,
+ CodeCommentStatusChange change, @Nullable String note) {
super(change.getUser(), change.getDate(), request, change.getComment());
this.change = change;
this.note = note;
@@ -34,4 +36,12 @@ public class PullRequestCodeCommentStatusChanged extends PullRequestCodeCommentE
return "unresolved code comment";
}
+ @Override
+ public PullRequestEvent cloneIn(Dao dao) {
+ return new PullRequestCodeCommentStatusChanged(
+ dao.load(PullRequest.class, getRequest().getId()),
+ dao.load(CodeCommentStatusChange.class, change.getId()),
+ note);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java
index e95f08d21b..130551fd5b 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java
@@ -3,6 +3,7 @@ package io.onedev.server.event.pullrequest;
import java.util.Collection;
import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.persistence.dao.Dao;
public class PullRequestCommented extends PullRequestEvent {
@@ -34,4 +35,11 @@ public class PullRequestCommented extends PullRequestEvent {
return "commented";
}
+ @Override
+ public PullRequestEvent cloneIn(Dao dao) {
+ return new PullRequestCommented(
+ dao.load(PullRequestComment.class, comment.getId()),
+ notifiedEmailAddresses);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java
index 732ec62f90..1dbce3b0b5 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java
@@ -5,6 +5,7 @@ import java.util.Date;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.Dao;
public abstract class PullRequestEvent extends ProjectEvent {
@@ -19,4 +20,6 @@ public abstract class PullRequestEvent extends ProjectEvent {
return request;
}
+ public abstract PullRequestEvent cloneIn(Dao dao);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
index 88b0c15038..90fb5a3f62 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
@@ -6,6 +6,7 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergePreview;
+import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.CommitAware;
import io.onedev.server.util.ProjectScopedCommit;
@@ -29,4 +30,9 @@ public class PullRequestMergePreviewCalculated extends PullRequestEvent implemen
return new ProjectScopedCommit(getProject(), ObjectId.zeroId());
}
+ @Override
+ public PullRequestEvent cloneIn(Dao dao) {
+ return new PullRequestMergePreviewCalculated(dao.load(PullRequest.class, getRequest().getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
index 917875c331..97bd273345 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
@@ -1,6 +1,7 @@
package io.onedev.server.event.pullrequest;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.persistence.dao.Dao;
public class PullRequestOpened extends PullRequestEvent {
@@ -18,4 +19,9 @@ public class PullRequestOpened extends PullRequestEvent {
return "opened";
}
+ @Override
+ public PullRequestEvent cloneIn(Dao dao) {
+ return new PullRequestOpened(dao.load(PullRequest.class, getRequest().getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewRequested.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewRequested.java
index 71280f5330..7d1023ef97 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewRequested.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewRequested.java
@@ -4,6 +4,7 @@ import java.util.Date;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.Dao;
public class PullRequestReviewRequested extends PullRequestEvent {
@@ -23,4 +24,13 @@ public class PullRequestReviewRequested extends PullRequestEvent {
return reviewer;
}
+ @Override
+ public PullRequestEvent cloneIn(Dao dao) {
+ return new PullRequestReviewRequested(
+ dao.load(User.class, getUser().getId()),
+ getDate(),
+ dao.load(PullRequest.class, getRequest().getId()),
+ dao.load(User.class, reviewer.getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewerRemoved.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewerRemoved.java
index af8713127a..3cfff5de8d 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewerRemoved.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewerRemoved.java
@@ -4,6 +4,7 @@ import java.util.Date;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.Dao;
public class PullRequestReviewerRemoved extends PullRequestEvent {
@@ -22,5 +23,14 @@ public class PullRequestReviewerRemoved extends PullRequestEvent {
public User getReviewer() {
return reviewer;
}
+
+ @Override
+ public PullRequestEvent cloneIn(Dao dao) {
+ return new PullRequestReviewerRemoved(
+ dao.load(User.class, getUser().getId()),
+ getDate(),
+ dao.load(PullRequest.class, getRequest().getId()),
+ dao.load(User.class, reviewer.getId()));
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUnassigned.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUnassigned.java
index 24291a0b31..2bdd938a2f 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUnassigned.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUnassigned.java
@@ -6,6 +6,7 @@ import javax.annotation.Nullable;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.Dao;
public class PullRequestUnassigned extends PullRequestEvent {
@@ -26,4 +27,13 @@ public class PullRequestUnassigned extends PullRequestEvent {
return assignee;
}
+ @Override
+ public PullRequestEvent cloneIn(Dao dao) {
+ return new PullRequestUnassigned(
+ dao.load(User.class, getUser().getId()),
+ getDate(),
+ dao.load(PullRequest.class, getRequest().getId()),
+ dao.load(User.class, assignee.getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java
index c2ac997a3a..9d54a6a7e4 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java
@@ -7,6 +7,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.EmailAddressManager;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.Dao;
public class PullRequestUpdated extends PullRequestEvent {
@@ -39,4 +40,10 @@ public class PullRequestUpdated extends PullRequestEvent {
}
return committers;
}
+
+ @Override
+ public PullRequestEvent cloneIn(Dao dao) {
+ return new PullRequestUpdated(dao.load(PullRequestUpdate.class, update.getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
index 250c8dce60..f2c592897b 100644
--- a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
+++ b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
@@ -67,28 +67,37 @@ public abstract class AbstractEntity implements Serializable, Comparable<Abstrac
}
@Override
- public boolean equals(Object other) {
- if (this == other) {
+ public final boolean equals(Object other) {
+ return equals(this, other);
+ }
+
+ @Override
+ public final int hashCode() {
+ return hashCode(this);
+ }
+
+ public static boolean equals(Object o1, Object o2) {
+ if (o1 == o2) {
return true;
- } else if (other instanceof AbstractEntity) {
- AbstractEntity otherEntity = (AbstractEntity) other;
- if (getId() == null || otherEntity.getId() == null)
- return super.equals(other);
+ } else if (o1 instanceof AbstractEntity && o2 instanceof AbstractEntity) {
+ Long id1 = ((AbstractEntity) o1).getId();
+ Long id2 = ((AbstractEntity) o2).getId();
+ if (id1 != null && id2 != null)
+ return new EqualsBuilder().append(id1, id2).isEquals();
else
- return new EqualsBuilder().append(getId(), otherEntity.getId()).isEquals();
+ return false;
} else {
return false;
}
}
-
- @Override
- public int hashCode() {
- if (getId() == null)
- return super.hashCode();
+
+ public static int hashCode(AbstractEntity entity) {
+ if (entity.getId() != null)
+ return new HashCodeBuilder(17, 37).append(entity.getId()).toHashCode();
else
- return new HashCodeBuilder(17, 37).append(getId()).toHashCode();
+ return System.identityHashCode(entity);
}
-
+
@Override
public int compareTo(AbstractEntity entity) {
if (getId() != null) {
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index b5e8b98983..1b598d9277 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -990,4 +990,8 @@ public class Build extends AbstractEntity implements Referenceable, AttachmentSt
return getArtifactsDir().exists() && getArtifactsDir().listFiles().length != 0;
}
+ public static String getSerialLockName(Long buildId) {
+ return "build-" + buildId + "-serial";
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/EmailAddress.java b/server-core/src/main/java/io/onedev/server/model/EmailAddress.java
index eea19c142c..d54855fd1d 100644
--- a/server-core/src/main/java/io/onedev/server/model/EmailAddress.java
+++ b/server-core/src/main/java/io/onedev/server/model/EmailAddress.java
@@ -21,6 +21,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.onedev.server.util.facade.EmailAddressFacade;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
@@ -65,7 +66,7 @@ public class EmailAddress extends AbstractEntity {
}
@Editable
- public String getVerficationCode() {
+ public String getVerificationCode() {
return verificationCode;
}
@@ -108,7 +109,12 @@ public class EmailAddress extends AbstractEntity {
}
public boolean isVerified() {
- return getVerficationCode() == null;
+ return getVerificationCode() == null;
}
+ public EmailAddressFacade getFacade() {
+ return new EmailAddressFacade(getId(), getValue(), isPrimary(), isGit(),
+ getVerificationCode(), getOwner().getId());
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Group.java b/server-core/src/main/java/io/onedev/server/model/Group.java
index ae5267a7d3..20a09b13a5 100644
--- a/server-core/src/main/java/io/onedev/server/model/Group.java
+++ b/server-core/src/main/java/io/onedev/server/model/Group.java
@@ -26,6 +26,8 @@ import io.onedev.server.web.editable.annotation.ShowCondition;
public class Group extends AbstractEntity implements Permission {
private static final long serialVersionUID = 1L;
+
+ public static final String PROP_ADMINISTRATOR = "administrator";
@Column(unique=true, nullable=false)
private String name;
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index 1c5d6fa2be..c2040eeaff 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -326,6 +326,8 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
private transient Collection<User> participants;
+ private transient Collection<User> authorizedUsers;
+
public String getState() {
return state;
}
@@ -511,6 +513,12 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
public void setAuthorizations(Collection<IssueAuthorization> authorizations) {
this.authorizations = authorizations;
}
+
+ public Collection<User> getAuthorizedUsers() {
+ if (authorizedUsers == null)
+ authorizedUsers = getAuthorizations().stream().map(it->it.getUser()).collect(Collectors.toSet());
+ return authorizedUsers;
+ }
public int getVoteCount() {
return voteCount;
@@ -919,6 +927,10 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
}
}
+ public static String getSerialLockName(Long issueId) {
+ return "issue-" + issueId + "-serial";
+ }
+
@Nullable
public static Issue get() {
if (!stack.get().isEmpty()) {
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index e6b507ea8c..e17c6da26c 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -327,6 +327,8 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
private transient Collection<Build> currentBuilds;
+ private transient Collection<User> assignees;
+
public String getTitle() {
return title;
}
@@ -670,6 +672,12 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
public void setAssignments(Collection<PullRequestAssignment> assignments) {
this.assignments = assignments;
}
+
+ public Collection<User> getAssignees() {
+ if (assignees == null)
+ assignees = getAssignments().stream().map(it->it.getUser()).collect(Collectors.toSet());
+ return assignees;
+ }
public Collection<Build> getBuilds() {
return builds;
@@ -1144,4 +1152,8 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
return null;
}
+ public static String getSerialLockName(Long requestId) {
+ return "pull-request-" + requestId + "-serial";
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.java
index 4df5099abc..00e3f77b69 100644
--- a/server-core/src/main/java/io/onedev/server/model/User.java
+++ b/server-core/src/main/java/io/onedev/server/model/User.java
@@ -7,10 +7,10 @@ import static io.onedev.server.model.User.PROP_SSO_CONNECTOR;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Optional;
import java.util.Stack;
import java.util.stream.Collectors;
@@ -39,6 +39,7 @@ import com.google.common.base.MoreObjects;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.EmailAddressManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.support.NamedProjectQuery;
@@ -50,7 +51,7 @@ import io.onedev.server.model.support.build.NamedBuildQuery;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.validation.annotation.UserName;
import io.onedev.server.util.watch.QuerySubscriptionSupport;
import io.onedev.server.util.watch.QueryWatchSupport;
@@ -215,6 +216,10 @@ public class User extends AbstractEntity implements AuthenticationInfo {
private transient List<EmailAddress> sortedEmailAddresses;
+ private transient Optional<EmailAddress> primaryEmailAddress;
+
+ private transient Optional<EmailAddress> gitEmailAddress;
+
public QueryPersonalization<NamedProjectQuery> getProjectQueryPersonalization() {
return new QueryPersonalization<NamedProjectQuery>() {
@@ -550,17 +555,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {
@Override
public int compareTo(AbstractEntity entity) {
User user = (User) entity;
- if (getDisplayName().equals(user.getDisplayName())) {
- return getId().compareTo(entity.getId());
- } else {
- return getDisplayName().compareTo(user.getDisplayName());
- }
- }
-
- public double getMatchScore(@Nullable String queryTerm) {
- double scoreOfName = MatchScoreUtils.getMatchScore(name, queryTerm);
- double scoreOfFullName = MatchScoreUtils.getMatchScore(fullName, queryTerm);
- return Math.max(scoreOfName, scoreOfFullName);
+ return getDisplayName().compareTo(user.getDisplayName());
}
public Collection<Group> getGroups() {
@@ -794,37 +789,27 @@ public class User extends AbstractEntity implements AuthenticationInfo {
public List<EmailAddress> getSortedEmailAddresses() {
if (sortedEmailAddresses == null) {
sortedEmailAddresses = new ArrayList<>(getEmailAddresses());
- Collections.sort(sortedEmailAddresses, new Comparator<EmailAddress>() {
-
- @Override
- public int compare(EmailAddress o1, EmailAddress o2) {
- if (o1.isPrimary() && o2.isPrimary() || !o1.isPrimary() && !o2.isPrimary()) {
- if (o1.isGit() && o2.isGit() || !o1.isGit() && !o2.isGit())
- return o1.getId().compareTo(o2.getId());
- else if (o1.isGit())
- return -1;
- else
- return 1;
- } else if (o1.isPrimary()) {
- return -1;
- } else {
- return 1;
- }
- }
-
- });
+ Collections.sort(sortedEmailAddresses);
}
return sortedEmailAddresses;
}
+ private EmailAddressManager getEmailAddressManager() {
+ return OneDev.getInstance(EmailAddressManager.class);
+ }
+
@Nullable
public EmailAddress getPrimaryEmailAddress() {
- return getSortedEmailAddresses().stream().filter(it->it.isPrimary()).findFirst().orElse(null);
+ if (primaryEmailAddress == null)
+ primaryEmailAddress = Optional.ofNullable(getEmailAddressManager().findPrimary(this));
+ return primaryEmailAddress.orElse(null);
}
@Nullable
public EmailAddress getGitEmailAddress() {
- return getSortedEmailAddresses().stream().filter(it->it.isGit()).findFirst().orElse(null);
+ if (gitEmailAddress == null)
+ gitEmailAddress = Optional.ofNullable(getEmailAddressManager().findGit(this));
+ return gitEmailAddress.orElse(null);
}
public List<GpgKey> getGpgKeys() {
@@ -835,4 +820,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {
return gpgKeys;
}
+ public UserFacade getFacade() {
+ return new UserFacade(getId(), getName(), getFullName(), getAccessToken());
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java
index 300a81ffdf..50eba5090f 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java
@@ -1,6 +1,7 @@
package io.onedev.server.model.support.administration;
import java.io.Serializable;
+import java.util.Optional;
import javax.annotation.Nullable;
@@ -29,6 +30,8 @@ public class SecuritySetting implements Serializable {
private boolean enforce2FA;
+ private transient Optional<Group> defaultLoginGroup;
+
@Editable(order=100, description="Whether or not to allow anonymous users to access this server")
public boolean isEnableAnonymousAccess() {
return enableAnonymousAccess;
@@ -71,14 +74,17 @@ public class SecuritySetting implements Serializable {
@Nullable
public Group getDefaultLoginGroup() {
- if (defaultLoginGroupName != null) {
- Group group = OneDev.getInstance(GroupManager.class).find(defaultLoginGroupName);
- if (group == null)
- logger.error("Unable to find default login group: " + defaultLoginGroupName);
- return group;
- } else {
- return null;
+ if (defaultLoginGroup == null) {
+ if (defaultLoginGroupName != null) {
+ Group group = OneDev.getInstance(GroupManager.class).find(defaultLoginGroupName);
+ if (group == null)
+ logger.error("Unable to find default login group: " + defaultLoginGroupName);
+ defaultLoginGroup = Optional.ofNullable(group);
+ } else {
+ defaultLoginGroup = Optional.empty();
+ }
}
+ return defaultLoginGroup.orElse(null);
}
public void onRenameGroup(String oldName, String newName) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/UserChoiceInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/UserChoiceInput.java
index 5271b741d9..346267015d 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/UserChoiceInput.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/UserChoiceInput.java
@@ -17,7 +17,10 @@ import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprov
public class UserChoiceInput {
public static List<String> getPossibleValues() {
- return OneDev.getInstance(UserManager.class).query().stream().map(user->user.getName()).collect(Collectors.toList());
+ return OneDev.getInstance(UserManager.class).cloneCache().values().stream()
+ .map(it->it.getName())
+ .sorted()
+ .collect(Collectors.toList());
}
public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java
index 721b39ece8..3cf8c51e86 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java
@@ -1,5 +1,6 @@
package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;
+import java.util.ArrayList;
import java.util.List;
import com.google.common.collect.Sets;
@@ -8,6 +9,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;
import io.onedev.server.web.util.WicketUtils;
@@ -19,14 +21,21 @@ public class AllUsers implements ChoiceProvider {
@Override
public List<User> getChoices(boolean allPossible) {
- UserManager userManager = OneDev.getInstance(UserManager.class);
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+
if (WicketUtils.getPage() instanceof IssueDetailPage) {
IssueDetailPage issueDetailPage = (IssueDetailPage) WicketUtils.getPage();
- return userManager.queryAndSort(issueDetailPage.getIssue().getParticipants());
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(issueDetailPage.getIssue().getParticipants()));
+ return users;
} else if (SecurityUtils.getUser() != null) {
- return userManager.queryAndSort(Sets.newHashSet(SecurityUtils.getUser()));
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(Sets.newHashSet(SecurityUtils.getUser())));
+ return users;
} else {
- return userManager.queryAndSort(Sets.newHashSet());
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(Sets.newHashSet()));
+ return users;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
index bf01441372..58fe87582d 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
@@ -1,12 +1,16 @@
package io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider;
+import java.util.ArrayList;
import java.util.List;
import org.hibernate.validator.constraints.NotEmpty;
+import com.google.common.collect.Sets;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.UserChoice;
@@ -37,7 +41,10 @@ public class SpecifiedDefaultValue implements DefaultValueProvider {
@SuppressWarnings("unused")
private static List<User> getValueChoices() {
- return OneDev.getInstance(UserManager.class).query();
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(Sets.newHashSet()));
+ return users;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java
index 61b0bdbf55..b15d167f33 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java
@@ -2,13 +2,10 @@ package io.onedev.server.model.support.issue.field.spec;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.support.inputspec.userchoiceinput.UserChoiceInput;
import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.AllUsers;
import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;
@@ -76,7 +73,7 @@ public class UserChoiceField extends FieldSpec {
@Override
public List<String> getPossibleValues() {
- return OneDev.getInstance(UserManager.class).query().stream().map(user->user.getName()).collect(Collectors.toList());
+ return UserChoiceInput.getPossibleValues();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
index 7187a517aa..8ff63c9e61 100644
--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
@@ -4,17 +4,21 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.apache.shiro.authz.Permission;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Lists;
import io.onedev.commons.loader.Listen;
+import io.onedev.commons.utils.LockUtils;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserManager;
@@ -28,8 +32,13 @@ import io.onedev.server.model.EmailAddress;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
+import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.search.entity.build.BuildQuery;
+import io.onedev.server.security.permission.AccessBuild;
+import io.onedev.server.security.permission.JobPermission;
+import io.onedev.server.security.permission.ProjectPermission;
@Singleton
public class BuildNotificationManager extends AbstractNotificationManager {
@@ -42,14 +51,24 @@ public class BuildNotificationManager extends AbstractNotificationManager {
private final UserManager userManager;
+ private final TransactionManager transactionManager;
+
+ private final ExecutorService executorService;
+
+ private final Dao dao;
+
@Inject
public BuildNotificationManager(MailManager mailManager, UrlManager urlManager,
UserManager userManager, SettingManager settingManager,
- MarkdownManager markdownManager) {
+ MarkdownManager markdownManager, TransactionManager transactionManager,
+ ExecutorService executorService, Dao dao) {
super(markdownManager, settingManager);
this.mailManager = mailManager;
this.urlManager = urlManager;
this.userManager = userManager;
+ this.transactionManager = transactionManager;
+ this.executorService = executorService;
+ this.dao = dao;
}
private void fillSubscribedQueryStrings(Map<User, Collection<String>> subscribedQueryStrings,
@@ -83,86 +102,127 @@ public class BuildNotificationManager extends AbstractNotificationManager {
@Sessional
@Listen
public void on(BuildEvent event) {
- if (!(event instanceof BuildUpdated)) {
- Project project = event.getProject();
- Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();
- for (BuildQueryPersonalization personalization: project.getBuildQueryPersonalizations()) {
- for (String name: personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {
- String commonName = NamedQuery.getCommonName(name);
- if (commonName != null) {
- fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),
- NamedQuery.find(project.getNamedBuildQueries(), commonName));
- }
- String personalName = NamedQuery.getPersonalName(name);
- if (personalName != null) {
- fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),
- NamedQuery.find(personalization.getQueries(), personalName));
- }
- }
- }
+ Long buildId = event.getBuild().getId();
+
+ transactionManager.runAfterCommit(new Runnable() {
- Build build = event.getBuild();
- Collection<String> notifyEmails = new HashSet<>();
- for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {
- User user = entry.getKey();
- for (String queryString: entry.getValue()) {
- User.push(user);
- try {
- if (BuildQuery.parse(event.getProject(), queryString, true, true).matches(build)) {
- EmailAddress emailAddress = user.getPrimaryEmailAddress();
- if (emailAddress != null && emailAddress.isVerified())
- notifyEmails.add(emailAddress.getValue());
- break;
- }
- } catch (Exception e) {
- String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",
- user.getName(), build.getFQN(), queryString);
- logger.error(message, e);
- } finally {
- User.pop();
- }
- }
- }
-
- subscribedQueryStrings.clear();
- for (User user: userManager.query()) {
- for (String name: user.getBuildQueryPersonalization().getQuerySubscriptionSupport().getQuerySubscriptions()) {
- String globalName = NamedQuery.getCommonName(name);
- if (globalName != null) {
- fillSubscribedQueryStrings(subscribedQueryStrings, user,
- NamedQuery.find(settingManager.getBuildSetting().getNamedQueries(), globalName));
- }
- String personalName = NamedQuery.getPersonalName(name);
- if (personalName != null) {
- fillSubscribedQueryStrings(subscribedQueryStrings, user,
- NamedQuery.find(user.getBuildQueryPersonalization().getQueries(), personalName));
- }
- }
- }
+ @Override
+ public void run() {
+ executorService.execute(new Runnable() {
+
+ @Override
+ public void run() {
+ LockUtils.call(Build.getSerialLockName(buildId), true, new Callable<Void>() {
+
+ @Override
+ public Void call() {
+ transactionManager.run(new Runnable() {
- for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {
- User user = entry.getKey();
- for (String queryString: entry.getValue()) {
- User.push(user);
- try {
- if (BuildQuery.parse(null, queryString, true, true).matches(build)) {
- EmailAddress emailAddress = user.getPrimaryEmailAddress();
- if (emailAddress != null && emailAddress.isVerified())
- notifyEmails.add(emailAddress.getValue());
- break;
- }
- } catch (Exception e) {
- String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",
- user.getName(), build.getFQN(), queryString);
- logger.error(message, e);
- } finally {
- User.pop();
+ @Override
+ public void run() {
+ BuildEvent clone = event.cloneIn(dao);
+ if (!(clone instanceof BuildUpdated)) {
+ Project project = clone.getProject();
+ Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();
+ for (BuildQueryPersonalization personalization: project.getBuildQueryPersonalizations()) {
+ for (String name: personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {
+ String commonName = NamedQuery.getCommonName(name);
+ if (commonName != null) {
+ fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),
+ NamedQuery.find(project.getNamedBuildQueries(), commonName));
+ }
+ String personalName = NamedQuery.getPersonalName(name);
+ if (personalName != null) {
+ fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),
+ NamedQuery.find(personalization.getQueries(), personalName));
+ }
+ }
+ }
+
+ Build build = clone.getBuild();
+ Collection<String> notifyEmails = new HashSet<>();
+ for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {
+ User user = entry.getKey();
+ Permission permission = new ProjectPermission(build.getProject(),
+ new JobPermission(build.getJobName(), new AccessBuild()));
+ if (user.asSubject().isPermitted(permission)) {
+ for (String queryString: entry.getValue()) {
+ User.push(user);
+ try {
+ if (BuildQuery.parse(clone.getProject(), queryString, true, true).matches(build)) {
+ EmailAddress emailAddress = user.getPrimaryEmailAddress();
+ if (emailAddress != null && emailAddress.isVerified())
+ notifyEmails.add(emailAddress.getValue());
+ break;
+ }
+ } catch (Exception e) {
+ String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",
+ user.getName(), build.getFQN(), queryString);
+ logger.error(message, e);
+ } finally {
+ User.pop();
+ }
+ }
+ }
+ }
+
+ subscribedQueryStrings.clear();
+ for (User user: userManager.query()) {
+ for (String name: user.getBuildQueryPersonalization().getQuerySubscriptionSupport().getQuerySubscriptions()) {
+ String globalName = NamedQuery.getCommonName(name);
+ if (globalName != null) {
+ fillSubscribedQueryStrings(subscribedQueryStrings, user,
+ NamedQuery.find(settingManager.getBuildSetting().getNamedQueries(), globalName));
+ }
+ String personalName = NamedQuery.getPersonalName(name);
+ if (personalName != null) {
+ fillSubscribedQueryStrings(subscribedQueryStrings, user,
+ NamedQuery.find(user.getBuildQueryPersonalization().getQueries(), personalName));
+ }
+ }
+ }
+
+ for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {
+ User user = entry.getKey();
+ Permission permission = new ProjectPermission(build.getProject(),
+ new JobPermission(build.getJobName(), new AccessBuild()));
+ if (user.asSubject().isPermitted(permission)) {
+ for (String queryString: entry.getValue()) {
+ User.push(user);
+ try {
+ if (BuildQuery.parse(null, queryString, true, true).matches(build)) {
+ EmailAddress emailAddress = user.getPrimaryEmailAddress();
+ if (emailAddress != null && emailAddress.isVerified())
+ notifyEmails.add(emailAddress.getValue());
+ break;
+ }
+ } catch (Exception e) {
+ String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",
+ user.getName(), build.getFQN(), queryString);
+ logger.error(message, e);
+ } finally {
+ User.pop();
+ }
+ }
+ }
+ }
+
+ BuildNotificationManager.this.notify(clone, notifyEmails);
+ }
+ }
+
+ });
+ return null;
+ }
+
+ });
}
- }
+
+ });
+
}
- notify(event, notifyEmails);
- }
+ });
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
index b0261c2323..41c25b82d1 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
@@ -23,7 +23,9 @@ import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.markdown.MentionParser;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.User;
+import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.Dao;
@Singleton
public class CodeCommentNotificationManager extends AbstractNotificationManager {
@@ -34,73 +36,94 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager
private final UserManager userManager;
+ private final TransactionManager transactionManager;
+
+ private final Dao dao;
+
@Inject
public CodeCommentNotificationManager(MailManager mailManager, MarkdownManager markdownManager,
- UrlManager urlManager, UserManager userManager, SettingManager settingManager) {
+ UrlManager urlManager, UserManager userManager, SettingManager settingManager,
+ TransactionManager transactionManager, Dao dao) {
super(markdownManager, settingManager);
this.mailManager = mailManager;
this.urlManager = urlManager;
this.userManager = userManager;
+ this.transactionManager = transactionManager;
+ this.dao = dao;
}
@Transactional
@Listen
public void on(CodeCommentEvent event) {
- CodeComment comment = event.getComment();
- if (comment.getCompareContext().getPullRequest() == null) {
- String markdown = event.getMarkdown();
- String renderedMarkdown = markdownManager.render(markdown);
- String processedMarkdown = markdownManager.process(renderedMarkdown, event.getProject(), null, null, true);
-
- Collection<User> notifyUsers = new HashSet<>();
-
- notifyUsers.add(comment.getUser());
- notifyUsers.addAll(comment.getReplies().stream().map(it->it.getUser()).collect(Collectors.toSet()));
- notifyUsers.addAll(comment.getChanges().stream().map(it->it.getUser()).collect(Collectors.toSet()));
-
- for (String userName: new MentionParser().parseMentions(renderedMarkdown)) {
- User user = userManager.findByName(userName);
- if (user != null)
- notifyUsers.add(user);
- }
-
- Set<String> emailAddresses = notifyUsers.stream()
- .filter(it-> it.isOrdinary()
- && !it.equals(event.getUser())
- && it.getPrimaryEmailAddress() != null
- && it.getPrimaryEmailAddress().isVerified())
- .map(it->it.getPrimaryEmailAddress().getValue())
- .collect(Collectors.toSet());
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ transactionManager.runAsync(new Runnable() {
- if (!emailAddresses.isEmpty()) {
- String url;
- if (event instanceof CodeCommentCreated)
- url = urlManager.urlFor(comment);
- else if (event instanceof CodeCommentReplied)
- url = urlManager.urlFor(((CodeCommentReplied)event).getReply());
- else if (event instanceof CodeCommentStatusChanged)
- url = urlManager.urlFor(((CodeCommentStatusChanged)event).getChange());
- else
- url = null;
-
- if (url != null) {
- String subject = String.format("[Code Comment] %s:%s",
- event.getProject().getPath(), comment.getMark().getPath());
-
- String summary = String.format("%s %s code comment",
- event.getUser().getDisplayName(), event.getActivity());
-
- String threadingReferences = "<" + comment.getProject().getPath()
- + "-codecomment-" + comment.getId() + "@onedev>";
+ @Override
+ public void run() {
+ CodeCommentEvent clone = event.cloneIn(dao);
+ CodeComment comment = clone.getComment();
+ if (comment.getCompareContext().getPullRequest() == null) {
+ String markdown = clone.getMarkdown();
+ String renderedMarkdown = markdownManager.render(markdown);
+ String processedMarkdown = markdownManager.process(renderedMarkdown, clone.getProject(), null, null, true);
+
+ Collection<User> notifyUsers = new HashSet<>();
+
+ notifyUsers.add(comment.getUser());
+ notifyUsers.addAll(comment.getReplies().stream().map(it->it.getUser()).collect(Collectors.toSet()));
+ notifyUsers.addAll(comment.getChanges().stream().map(it->it.getUser()).collect(Collectors.toSet()));
+
+ for (String userName: new MentionParser().parseMentions(renderedMarkdown)) {
+ User user = userManager.findByName(userName);
+ if (user != null)
+ notifyUsers.add(user);
+ }
+
+ Set<String> emailAddresses = notifyUsers.stream()
+ .filter(it-> it.isOrdinary()
+ && !it.equals(clone.getUser())
+ && it.getPrimaryEmailAddress() != null
+ && it.getPrimaryEmailAddress().isVerified())
+ .map(it->it.getPrimaryEmailAddress().getValue())
+ .collect(Collectors.toSet());
- mailManager.sendMailAsync(emailAddresses, Lists.newArrayList(),
- Lists.newArrayList(), subject,
- getHtmlBody(event, summary, processedMarkdown, url, false, null),
- getTextBody(event, summary, markdown, url, false, null),
- null, threadingReferences);
- }
+ if (!emailAddresses.isEmpty()) {
+ String url;
+ if (clone instanceof CodeCommentCreated)
+ url = urlManager.urlFor(comment);
+ else if (clone instanceof CodeCommentReplied)
+ url = urlManager.urlFor(((CodeCommentReplied)clone).getReply());
+ else if (clone instanceof CodeCommentStatusChanged)
+ url = urlManager.urlFor(((CodeCommentStatusChanged)clone).getChange());
+ else
+ url = null;
+
+ if (url != null) {
+ String subject = String.format("[Code Comment] %s:%s",
+ clone.getProject().getPath(), comment.getMark().getPath());
+
+ String summary = String.format("%s %s code comment",
+ clone.getUser().getDisplayName(), clone.getActivity());
+
+ String threadingReferences = "<" + comment.getProject().getPath()
+ + "-codecomment-" + comment.getId() + "@onedev>";
+
+ mailManager.sendMailAsync(emailAddresses, Lists.newArrayList(),
+ Lists.newArrayList(), subject,
+ getHtmlBody(clone, summary, processedMarkdown, url, false, null),
+ getTextBody(clone, summary, markdown, url, false, null),
+ null, threadingReferences);
+ }
+ }
+ }
+ }
+ });
}
- }
+
+ });
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
index e46885d908..3ad5a62651 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
@@ -31,6 +31,8 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.search.commit.CommitQuery;
+import io.onedev.server.security.permission.ProjectPermission;
+import io.onedev.server.security.permission.ReadCode;
@Singleton
public class CommitNotificationManager extends AbstractNotificationManager {
@@ -85,22 +87,24 @@ public class CommitNotificationManager extends AbstractNotificationManager {
Collection<String> notifyEmails = new HashSet<>();
for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {
User user = entry.getKey();
- for (String queryString: entry.getValue()) {
- User.push(user);
- try {
- if (CommitQuery.parse(project, queryString).matches(event)) {
- EmailAddress emailAddress = user.getPrimaryEmailAddress();
- if (emailAddress != null && emailAddress.isVerified())
- notifyEmails.add(emailAddress.getValue());
- break;
+ if (user.asSubject().isPermitted(new ProjectPermission(event.getProject(), new ReadCode()))) {
+ for (String queryString: entry.getValue()) {
+ User.push(user);
+ try {
+ if (CommitQuery.parse(project, queryString).matches(event)) {
+ EmailAddress emailAddress = user.getPrimaryEmailAddress();
+ if (emailAddress != null && emailAddress.isVerified())
+ notifyEmails.add(emailAddress.getValue());
+ break;
+ }
+ } catch (Exception e) {
+ String message = String.format("Error processing commit subscription "
+ + "(user: %s, project: %s, commit: %s, query: %s)",
+ user.getName(), project.getPath(), event.getNewCommitId().name(), queryString);
+ logger.error(message, e);
+ } finally {
+ User.pop();
}
- } catch (Exception e) {
- String message = String.format("Error processing commit subscription "
- + "(user: %s, project: %s, commit: %s, query: %s)",
- user.getName(), project.getPath(), event.getNewCommitId().name(), queryString);
- logger.error(message, e);
- } finally {
- User.pop();
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index 35e6c3e227..7f54449f48 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -5,6 +5,8 @@ import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
import java.util.stream.Collectors;
import javax.inject.Inject;
@@ -16,6 +18,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import io.onedev.commons.loader.Listen;
+import io.onedev.commons.utils.LockUtils;
import io.onedev.server.entitymanager.IssueAuthorizationManager;
import io.onedev.server.entitymanager.IssueWatchManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -37,7 +40,9 @@ import io.onedev.server.model.IssueWatch;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.model.support.QueryPersonalization;
+import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryWatchBuilder;
import io.onedev.server.search.entity.issue.IssueQuery;
@@ -59,10 +64,17 @@ public class IssueNotificationManager extends AbstractNotificationManager {
private final UserInfoManager userInfoManager;
+ private final TransactionManager transactionManager;
+
+ private final ExecutorService executorService;
+
+ private final Dao dao;
+
@Inject
public IssueNotificationManager(MarkdownManager markdownManager, MailManager mailManager,
UrlManager urlManager, IssueWatchManager watchManager, UserInfoManager userInfoManager,
- UserManager userManager, SettingManager settingManager, IssueAuthorizationManager authorizationManager) {
+ UserManager userManager, SettingManager settingManager, IssueAuthorizationManager authorizationManager,
+ TransactionManager transactionManager, ExecutorService executorService, Dao dao) {
super(markdownManager, settingManager);
this.mailManager = mailManager;
this.urlManager = urlManager;
@@ -70,204 +82,242 @@ public class IssueNotificationManager extends AbstractNotificationManager {
this.userInfoManager = userInfoManager;
this.userManager = userManager;
this.authorizationManager = authorizationManager;
+ this.transactionManager = transactionManager;
+ this.executorService = executorService;
+ this.dao = dao;
}
@Transactional
@Listen
public void on(IssueEvent event) {
- Issue issue = event.getIssue();
- User user = event.getUser();
+ Long issueId = event.getIssue().getId();
+
+ transactionManager.runAfterCommit(new Runnable() {
- String url;
- if (event instanceof IssueCommented)
- url = urlManager.urlFor(((IssueCommented)event).getComment());
- else if (event instanceof IssueChanged)
- url = urlManager.urlFor(((IssueChanged)event).getChange());
- else
- url = urlManager.urlFor(issue);
+ @Override
+ public void run() {
+ executorService.execute(new Runnable() {
- String summary;
- if (user != null)
- summary = user.getDisplayName() + " " + event.getActivity();
- else
- summary = StringUtils.capitalize(event.getActivity());
+ @Override
+ public void run() {
+ LockUtils.call(Issue.getSerialLockName(issueId), true, new Callable<Void>() {
- for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {
+ @Override
+ public Void call() throws Exception {
+ transactionManager.run(new Runnable() {
- @Override
- protected Issue getEntity() {
- return issue;
- }
+ @Override
+ public void run() {
+ IssueEvent clone = event.cloneIn(dao);
+
+ Issue issue = clone.getIssue();
+ User user = clone.getUser();
- @Override
- protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
- return issue.getProject().getIssueQueryPersonalizations();
- }
+ String url;
+ if (clone instanceof IssueCommented)
+ url = urlManager.urlFor(((IssueCommented)clone).getComment());
+ else if (clone instanceof IssueChanged)
+ url = urlManager.urlFor(((IssueChanged)clone).getChange());
+ else
+ url = urlManager.urlFor(issue);
- @Override
- protected EntityQuery<Issue> parse(String queryString) {
- IssueQueryParseOption option = new IssueQueryParseOption().withCurrentUserCriteria(true);
- return IssueQuery.parse(issue.getProject(), queryString, option, true);
- }
+ String summary;
+ if (user != null)
+ summary = user.getDisplayName() + " " + clone.getActivity();
+ else
+ summary = StringUtils.capitalize(clone.getActivity());
- @Override
- protected Collection<? extends NamedQuery> getNamedQueries() {
- return issue.getProject().getNamedIssueQueries();
- }
-
- }.getWatches().entrySet()) {
- if (SecurityUtils.canAccess(entry.getKey().asSubject(), issue))
- watchManager.watch(issue, entry.getKey(), entry.getValue());
- }
-
- for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {
+ for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {
- @Override
- protected Issue getEntity() {
- return issue;
- }
+ @Override
+ protected Issue getEntity() {
+ return issue;
+ }
- @Override
- protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
- return userManager.query().stream().map(it->it.getIssueQueryPersonalization()).collect(Collectors.toList());
- }
+ @Override
+ protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
+ return issue.getProject().getIssueQueryPersonalizations();
+ }
- @Override
- protected EntityQuery<Issue> parse(String queryString) {
- IssueQueryParseOption option = new IssueQueryParseOption().withCurrentBuildCriteria(true);
- return IssueQuery.parse(null, queryString, option, true);
- }
+ @Override
+ protected EntityQuery<Issue> parse(String queryString) {
+ IssueQueryParseOption option = new IssueQueryParseOption().withCurrentUserCriteria(true);
+ return IssueQuery.parse(issue.getProject(), queryString, option, true);
+ }
- @Override
- protected Collection<? extends NamedQuery> getNamedQueries() {
- return settingManager.getIssueSetting().getNamedQueries();
- }
-
- }.getWatches().entrySet()) {
- if (SecurityUtils.canAccess(entry.getKey().asSubject(), issue))
- watchManager.watch(issue, entry.getKey(), entry.getValue());
- }
-
- Collection<User> notifiedUsers = Sets.newHashSet();
- if (user != null) {
- notifiedUsers.add(user); // no need to notify the user generating the event
- if (!user.isSystem())
- watchManager.watch(issue, user, true);
- }
+ @Override
+ protected Collection<? extends NamedQuery> getNamedQueries() {
+ return issue.getProject().getNamedIssueQueries();
+ }
+
+ }.getWatches().entrySet()) {
+ if (SecurityUtils.canAccess(entry.getKey().asSubject(), issue))
+ watchManager.watch(issue, entry.getKey(), entry.getValue());
+ }
+
+ for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {
- Map<String, Group> newGroups = event.getNewGroups();
- Map<String, Collection<User>> newUsers = event.getNewUsers();
-
- String replyAddress = mailManager.getReplyAddress(issue);
- boolean replyable = replyAddress != null;
- for (Map.Entry<String, Group> entry: newGroups.entrySet()) {
- String subject = String.format("[Issue %s] (%s: You) %s", issue.getFQN(), entry.getKey(), issue.getTitle());
- String threadingReferences = String.format("<you-in-field-%s-%s@onedev>", entry.getKey(), issue.getUUID());
- for (User member: entry.getValue().getMembers()) {
- if (!member.equals(user)) {
- EmailAddress emailAddress = member.getPrimaryEmailAddress();
- if (emailAddress != null && emailAddress.isVerified()) {
- mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),
- Lists.newArrayList(), Lists.newArrayList(), subject,
- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, summary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
+ @Override
+ protected Issue getEntity() {
+ return issue;
+ }
+
+ @Override
+ protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
+ return userManager.query().stream().map(it->it.getIssueQueryPersonalization()).collect(Collectors.toList());
+ }
+
+ @Override
+ protected EntityQuery<Issue> parse(String queryString) {
+ IssueQueryParseOption option = new IssueQueryParseOption().withCurrentBuildCriteria(true);
+ return IssueQuery.parse(null, queryString, option, true);
+ }
+
+ @Override
+ protected Collection<? extends NamedQuery> getNamedQueries() {
+ return settingManager.getIssueSetting().getNamedQueries();
+ }
+
+ }.getWatches().entrySet()) {
+ if (SecurityUtils.canAccess(entry.getKey().asSubject(), issue))
+ watchManager.watch(issue, entry.getKey(), entry.getValue());
+ }
+
+ Collection<User> notifiedUsers = Sets.newHashSet();
+ if (user != null) {
+ notifiedUsers.add(user); // no need to notify the user generating the event
+ if (!user.isSystem())
+ watchManager.watch(issue, user, true);
+ }
+
+ Map<String, Group> newGroups = clone.getNewGroups();
+ Map<String, Collection<User>> newUsers = clone.getNewUsers();
+
+ String replyAddress = mailManager.getReplyAddress(issue);
+ boolean replyable = replyAddress != null;
+ for (Map.Entry<String, Group> entry: newGroups.entrySet()) {
+ String subject = String.format("[Issue %s] (%s: You) %s", issue.getFQN(), entry.getKey(), issue.getTitle());
+ String threadingReferences = String.format("<you-in-field-%s-%s@onedev>", entry.getKey(), issue.getUUID());
+ for (User member: entry.getValue().getMembers()) {
+ if (!member.equals(user)) {
+ EmailAddress emailAddress = member.getPrimaryEmailAddress();
+ if (emailAddress != null && emailAddress.isVerified()) {
+ mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),
+ Lists.newArrayList(), Lists.newArrayList(), subject,
+ getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),
+ getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),
+ replyAddress, threadingReferences);
+ }
+ }
+ }
+
+ for (User member: entry.getValue().getMembers()) {
+ watchManager.watch(issue, member, true);
+ authorizationManager.authorize(issue, member);
+ }
+
+ notifiedUsers.addAll(entry.getValue().getMembers());
+ }
+
+ for (Map.Entry<String, Collection<User>> entry: newUsers.entrySet()) {
+ String subject = String.format("[Issue %s] (%s: You) %s", issue.getFQN(), entry.getKey(), issue.getTitle());
+ String threadingReferences = String.format("<you-in-field-%s-%s@onedev>", entry.getKey(), issue.getUUID());
+ for (User member: entry.getValue()) {
+ if (!member.equals(user)) {
+ EmailAddress emailAddress = member.getPrimaryEmailAddress();
+ if (emailAddress != null && emailAddress.isVerified()) {
+ mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),
+ Lists.newArrayList(), Lists.newArrayList(), subject,
+ getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),
+ getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),
+ replyAddress, threadingReferences);
+ }
+ }
+ }
+
+ for (User each: entry.getValue()) {
+ watchManager.watch(issue, each, true);
+ authorizationManager.authorize(issue, each);
+ }
+ notifiedUsers.addAll(entry.getValue());
+ }
+
+ Collection<String> notifiedEmailAddresses;
+ if (clone instanceof IssueCommented)
+ notifiedEmailAddresses = ((IssueCommented) clone).getNotifiedEmailAddresses();
+ else
+ notifiedEmailAddresses = new ArrayList<>();
+
+ if (clone.getRenderedMarkdown() != null) {
+ for (String userName: new MentionParser().parseMentions(clone.getRenderedMarkdown())) {
+ User mentionedUser = userManager.findByName(userName);
+ if (mentionedUser != null) {
+ watchManager.watch(issue, mentionedUser, true);
+ authorizationManager.authorize(issue, mentionedUser);
+ if (!isNotified(notifiedEmailAddresses, mentionedUser)) {
+ String subject = String.format("[Issue %s] (Mentioned You) %s", issue.getFQN(), issue.getTitle());
+ String threadingReferences = String.format("<mentioned-%s@onedev>", issue.getUUID());
+
+ EmailAddress emailAddress = mentionedUser.getPrimaryEmailAddress();
+ if (emailAddress != null && emailAddress.isVerified()) {
+ mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),
+ Sets.newHashSet(), Sets.newHashSet(), subject,
+ getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),
+ getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),
+ replyAddress, threadingReferences);
+ }
+ notifiedUsers.add(mentionedUser);
+ }
+ }
+ }
+ }
+
+ if (!(clone instanceof IssueChanged)
+ || !(((IssueChanged) clone).getChange().getData() instanceof ReferencedFromAware)) {
+ Collection<String> bccEmailAddresses = new HashSet<>();
+
+ for (IssueWatch watch: issue.getWatches()) {
+ Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);
+ if (watch.isWatching()
+ && (visitDate == null || visitDate.before(clone.getDate()))
+ && !notifiedUsers.contains(watch.getUser())
+ && !isNotified(notifiedEmailAddresses, watch.getUser())
+ && SecurityUtils.canAccess(watch.getUser().asSubject(), issue)) {
+ EmailAddress emailAddress = watch.getUser().getPrimaryEmailAddress();
+ if (emailAddress != null && emailAddress.isVerified())
+ bccEmailAddresses.add(emailAddress.getValue());
+ }
+ }
+
+ if (!bccEmailAddresses.isEmpty()) {
+ String subject = String.format("[Issue %s] (%s) %s",
+ issue.getFQN(), (clone instanceof IssueOpened)?"Opened":"Updated", issue.getTitle());
+
+ Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(issue));
+ String htmlBody = getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, unsubscribable);
+ String textBody = getTextBody(clone, summary, clone.getTextBody(), url, replyable, unsubscribable);
+
+ String threadingReferences = issue.getEffectiveThreadingReference();
+ mailManager.sendMailAsync(Sets.newHashSet(), Sets.newHashSet(),
+ bccEmailAddresses, subject, htmlBody, textBody,
+ replyAddress, threadingReferences);
+ }
+ }
+ }
+
+ });
+ return null;
+ }
+
+ });
}
- }
- }
-
- for (User member: entry.getValue().getMembers()) {
- watchManager.watch(issue, member, true);
- authorizationManager.authorize(issue, member);
- }
-
- notifiedUsers.addAll(entry.getValue().getMembers());
- }
-
- for (Map.Entry<String, Collection<User>> entry: newUsers.entrySet()) {
- String subject = String.format("[Issue %s] (%s: You) %s", issue.getFQN(), entry.getKey(), issue.getTitle());
- String threadingReferences = String.format("<you-in-field-%s-%s@onedev>", entry.getKey(), issue.getUUID());
- for (User member: entry.getValue()) {
- if (!member.equals(user)) {
- EmailAddress emailAddress = member.getPrimaryEmailAddress();
- if (emailAddress != null && emailAddress.isVerified()) {
- mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),
- Lists.newArrayList(), Lists.newArrayList(), subject,
- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, summary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
- }
- }
+
+ });
+
}
- for (User each: entry.getValue()) {
- watchManager.watch(issue, each, true);
- authorizationManager.authorize(issue, each);
- }
- notifiedUsers.addAll(entry.getValue());
- }
-
- Collection<String> notifiedEmailAddresses;
- if (event instanceof IssueCommented)
- notifiedEmailAddresses = ((IssueCommented) event).getNotifiedEmailAddresses();
- else
- notifiedEmailAddresses = new ArrayList<>();
+ });
- if (event.getRenderedMarkdown() != null) {
- for (String userName: new MentionParser().parseMentions(event.getRenderedMarkdown())) {
- User mentionedUser = userManager.findByName(userName);
- if (mentionedUser != null) {
- watchManager.watch(issue, mentionedUser, true);
- authorizationManager.authorize(issue, mentionedUser);
- if (!isNotified(notifiedEmailAddresses, mentionedUser)) {
- String subject = String.format("[Issue %s] (Mentioned You) %s", issue.getFQN(), issue.getTitle());
- String threadingReferences = String.format("<mentioned-%s@onedev>", issue.getUUID());
-
- EmailAddress emailAddress = mentionedUser.getPrimaryEmailAddress();
- if (emailAddress != null && emailAddress.isVerified()) {
- mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),
- Sets.newHashSet(), Sets.newHashSet(), subject,
- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, summary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
- }
- notifiedUsers.add(mentionedUser);
- }
- }
- }
- }
-
- if (!(event instanceof IssueChanged)
- || !(((IssueChanged) event).getChange().getData() instanceof ReferencedFromAware)) {
- Collection<String> bccEmailAddresses = new HashSet<>();
-
- for (IssueWatch watch: issue.getWatches()) {
- Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);
- if (watch.isWatching()
- && (visitDate == null || visitDate.before(event.getDate()))
- && !notifiedUsers.contains(watch.getUser())
- && !isNotified(notifiedEmailAddresses, watch.getUser())
- && SecurityUtils.canAccess(issue)) {
- EmailAddress emailAddress = watch.getUser().getPrimaryEmailAddress();
- if (emailAddress != null && emailAddress.isVerified())
- bccEmailAddresses.add(emailAddress.getValue());
- }
- }
-
- if (!bccEmailAddresses.isEmpty()) {
- String subject = String.format("[Issue %s] (%s) %s",
- issue.getFQN(), (event instanceof IssueOpened)?"Opened":"Updated", issue.getTitle());
-
- Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(issue));
- String htmlBody = getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, unsubscribable);
- String textBody = getTextBody(event, summary, event.getTextBody(), url, replyable, unsubscribable);
-
- String threadingReferences = issue.getEffectiveThreadingReference();
- mailManager.sendMailAsync(Sets.newHashSet(), Sets.newHashSet(),
- bccEmailAddresses, subject, htmlBody, textBody,
- replyAddress, threadingReferences);
- }
- }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index ff5d8a0f52..17a58970aa 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -6,6 +6,8 @@ import java.util.Date;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
import java.util.stream.Collectors;
import javax.inject.Inject;
@@ -13,11 +15,13 @@ import javax.inject.Singleton;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.WordUtils;
+import org.apache.shiro.authz.Permission;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import io.onedev.commons.loader.Listen;
+import io.onedev.commons.utils.LockUtils;
import io.onedev.server.entitymanager.PullRequestWatchManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
@@ -55,10 +59,14 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardD
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;
+import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryWatchBuilder;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
+import io.onedev.server.security.permission.ProjectPermission;
+import io.onedev.server.security.permission.ReadCode;
@Singleton
public class PullRequestNotificationManager extends AbstractNotificationManager {
@@ -73,282 +81,327 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
private final UserManager userManager;
+ private final TransactionManager transactionManager;
+
+ private final ExecutorService executorService;
+
+ private final Dao dao;
+
@Inject
public PullRequestNotificationManager(MailManager mailManager, UrlManager urlManager,
MarkdownManager markdownManager, PullRequestWatchManager pullRequestWatchManager,
- UserInfoManager userInfoManager, UserManager userManager, SettingManager settingManager) {
+ UserInfoManager userInfoManager, UserManager userManager, SettingManager settingManager,
+ TransactionManager transactionManager, ExecutorService executorService, Dao dao) {
super(markdownManager, settingManager);
this.mailManager = mailManager;
this.urlManager = urlManager;
this.pullRequestWatchManager = pullRequestWatchManager;
this.userInfoManager = userInfoManager;
this.userManager = userManager;
+ this.transactionManager = transactionManager;
+ this.executorService = executorService;
+ this.dao = dao;
}
@Transactional
@Listen
public void on(PullRequestEvent event) {
- PullRequest request = event.getRequest();
- User user = event.getUser();
-
- String url;
- if (event instanceof PullRequestCommented)
- url = urlManager.urlFor(((PullRequestCommented)event).getComment());
- else if (event instanceof PullRequestChanged)
- url = urlManager.urlFor(((PullRequestChanged)event).getChange());
- else if (event instanceof PullRequestCodeCommentCreated)
- url = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment());
- else if (event instanceof PullRequestCodeCommentReplied)
- url = urlManager.urlFor(((PullRequestCodeCommentReplied)event).getReply());
- else if (event instanceof PullRequestCodeCommentStatusChanged)
- url = urlManager.urlFor(((PullRequestCodeCommentStatusChanged)event).getChange());
- else
- url = urlManager.urlFor(request);
+ Long requestId = event.getRequest().getId();
- for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {
+ transactionManager.runAfterCommit(new Runnable() {
@Override
- protected PullRequest getEntity() {
- return request;
- }
+ public void run() {
+ executorService.execute(new Runnable() {
- @Override
- protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
- return request.getTargetProject().getPullRequestQueryPersonalizations();
- }
+ @Override
+ public void run() {
+ LockUtils.call(PullRequest.getSerialLockName(requestId), true, new Callable<Void>() {
- @Override
- protected EntityQuery<PullRequest> parse(String queryString) {
- return PullRequestQuery.parse(request.getTargetProject(), queryString);
- }
+ @Override
+ public Void call() throws Exception {
+ transactionManager.run(new Runnable() {
- @Override
- protected Collection<? extends NamedQuery> getNamedQueries() {
- return request.getTargetProject().getNamedPullRequestQueries();
- }
-
- }.getWatches().entrySet()) {
- pullRequestWatchManager.watch(request, entry.getKey(), entry.getValue());
- }
-
- for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {
+ @Override
+ public void run() {
+ PullRequestEvent clone = event.cloneIn(dao);
+ PullRequest request = clone.getRequest();
+ User user = clone.getUser();
- @Override
- protected PullRequest getEntity() {
- return request;
- }
+ String url;
+ if (clone instanceof PullRequestCommented)
+ url = urlManager.urlFor(((PullRequestCommented)clone).getComment());
+ else if (clone instanceof PullRequestChanged)
+ url = urlManager.urlFor(((PullRequestChanged)clone).getChange());
+ else if (clone instanceof PullRequestCodeCommentCreated)
+ url = urlManager.urlFor(((PullRequestCodeCommentCreated)clone).getComment());
+ else if (clone instanceof PullRequestCodeCommentReplied)
+ url = urlManager.urlFor(((PullRequestCodeCommentReplied)clone).getReply());
+ else if (clone instanceof PullRequestCodeCommentStatusChanged)
+ url = urlManager.urlFor(((PullRequestCodeCommentStatusChanged)clone).getChange());
+ else
+ url = urlManager.urlFor(request);
+
+ for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {
- @Override
- protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
- return userManager.query().stream().map(it->it.getPullRequestQueryPersonalization()).collect(Collectors.toList());
- }
+ @Override
+ protected PullRequest getEntity() {
+ return request;
+ }
- @Override
- protected EntityQuery<PullRequest> parse(String queryString) {
- return PullRequestQuery.parse(null, queryString);
- }
+ @Override
+ protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
+ return request.getTargetProject().getPullRequestQueryPersonalizations();
+ }
- @Override
- protected Collection<? extends NamedQuery> getNamedQueries() {
- return settingManager.getPullRequestSetting().getNamedQueries();
- }
-
- }.getWatches().entrySet()) {
- pullRequestWatchManager.watch(request, entry.getKey(), entry.getValue());
- }
-
- Collection<User> notifiedUsers = Sets.newHashSet();
- if (user != null) {
- notifiedUsers.add(user); // no need to notify the user generating the event
- if (!user.isSystem())
- pullRequestWatchManager.watch(request, user, true);
- }
-
- User committer = null;
- if (event instanceof PullRequestUpdated) {
- PullRequestUpdated pullRequestUpdated = (PullRequestUpdated) event;
- Collection<User> committers = pullRequestUpdated.getCommitters();
- if (committers.size() == 1) {
- committer = committers.iterator().next();
- notifiedUsers.add(committer);
- }
- for (User each: committers) {
- if (!each.isSystem())
- pullRequestWatchManager.watch(request, each, true);
- }
- }
-
- String summary;
- if (user != null)
- summary = user.getDisplayName() + " " + event.getActivity();
- else if (committer != null)
- summary = committer.getDisplayName() + " " + event.getActivity();
- else
- summary = StringUtils.capitalize(event.getActivity());
-
- String replyAddress = mailManager.getReplyAddress(request);
- boolean replyable = replyAddress != null;
-
- Set<User> reviewers = new HashSet<>();
- Set<User> assignees = new HashSet<>();
- if (event instanceof PullRequestOpened) {
- for (PullRequestReview review: request.getReviews()) {
- if (review.getStatus() == Status.PENDING)
- reviewers.add(review.getUser());
- }
- for (PullRequestAssignment assignment: request.getAssignments())
- assignees.add(assignment.getUser());
- } else if (event instanceof PullRequestChanged) {
- PullRequestChanged changeEvent = (PullRequestChanged) event;
- PullRequestChangeData changeData = changeEvent.getChange().getData();
- if ((changeData instanceof PullRequestApproveData
- || changeData instanceof PullRequestRequestedForChangesData
- || changeData instanceof PullRequestDiscardData)
- && request.getSubmitter() != null && !notifiedUsers.contains(request.getSubmitter())) {
- String subject = String.format("[Pull Request %s] (%s) %s", request.getFQN(),
- WordUtils.capitalize(changeData.getActivity()), request.getTitle());
- String threadingReferences = String.format("<%s-%s@onedev>",
- changeData.getActivity().replace(' ', '-'), request.getUUID());
- EmailAddress emailAddress = request.getSubmitter().getPrimaryEmailAddress();
- if (emailAddress != null && emailAddress.isVerified()) {
- mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),
- Lists.newArrayList(), Lists.newArrayList(), subject,
- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, summary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
- }
- notifiedUsers.add(request.getSubmitter());
- }
- } else if (event instanceof PullRequestAssigned) {
- assignees.add(((PullRequestAssigned) event).getAssignee());
- } else if (event instanceof PullRequestReviewRequested) {
- reviewers.add(((PullRequestReviewRequested) event).getReviewer());
- }
+ @Override
+ protected EntityQuery<PullRequest> parse(String queryString) {
+ return PullRequestQuery.parse(request.getTargetProject(), queryString);
+ }
- for (User assignee: assignees) {
- pullRequestWatchManager.watch(request, assignee, true);
- if (!notifiedUsers.contains(assignee)) {
- String subject = String.format("[Pull Request %s] (Assigned) %s",
- request.getFQN(), request.getTitle());
- String threadingReferences = String.format("<assigned-%s@onedev>", request.getUUID());
- String assignmentSummary;
- if (user != null)
- assignmentSummary = user.getDisplayName() + " assigned to you";
- else
- assignmentSummary = "Assigned to you";
- EmailAddress emailAddress = assignee.getPrimaryEmailAddress();
- if (emailAddress != null && emailAddress.isVerified()) {
- mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),
- Lists.newArrayList(), Lists.newArrayList(), subject,
- getHtmlBody(event, assignmentSummary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, assignmentSummary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
- }
- notifiedUsers.add(assignee);
- }
- }
+ @Override
+ protected Collection<? extends NamedQuery> getNamedQueries() {
+ return request.getTargetProject().getNamedPullRequestQueries();
+ }
+
+ }.getWatches().entrySet()) {
+ pullRequestWatchManager.watch(request, entry.getKey(), entry.getValue());
+ }
+
+ for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {
- for (User reviewer: reviewers) {
- pullRequestWatchManager.watch(request, reviewer, true);
- if (!notifiedUsers.contains(reviewer)) {
- String subject = String.format("[Pull Request %s] (Review Request) %s",
- request.getFQN(), request.getTitle());
- String threadingReferences = String.format("<review-invitation-%s@onedev>", request.getUUID());
- String reviewInvitationSummary;
- if (user != null)
- reviewInvitationSummary = user.getDisplayName() + " requested review from you";
- else
- reviewInvitationSummary = "Requested review from you";
-
- EmailAddress emailAddress = reviewer.getPrimaryEmailAddress();
- if (emailAddress != null && emailAddress.isVerified()) {
- mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),
- Lists.newArrayList(), Lists.newArrayList(), subject,
- getHtmlBody(event, reviewInvitationSummary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, reviewInvitationSummary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
- }
- notifiedUsers.add(reviewer);
- }
- }
-
- Collection<String> notifiedEmailAddresses;
- if (event instanceof PullRequestCommented)
- notifiedEmailAddresses = ((PullRequestCommented) event).getNotifiedEmailAddresses();
- else
- notifiedEmailAddresses = new ArrayList<>();
-
- if (event.getRenderedMarkdown() != null) {
- for (String userName: new MentionParser().parseMentions(event.getRenderedMarkdown())) {
- User mentionedUser = userManager.findByName(userName);
- if (mentionedUser != null) {
- pullRequestWatchManager.watch(request, mentionedUser, true);
- if (!isNotified(notifiedEmailAddresses, mentionedUser)) {
- String subject = String.format("[Pull Request %s] (Mentioned You) %s", request.getFQN(), request.getTitle());
- String threadingReferences = String.format("<mentioned-%s@onedev>", request.getUUID());
-
- EmailAddress emailAddress = mentionedUser.getPrimaryEmailAddress();
- if (emailAddress != null && emailAddress.isVerified()) {
- mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),
- Sets.newHashSet(), Sets.newHashSet(), subject,
- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, summary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
- }
- notifiedUsers.add(mentionedUser);
- }
- }
- }
- }
-
- boolean notifyWatchers = false;
- if (event instanceof PullRequestChanged) {
- PullRequestChangeData changeData = ((PullRequestChanged) event).getChange().getData();
- if (changeData instanceof PullRequestApproveData
- || changeData instanceof PullRequestRequestedForChangesData
- || changeData instanceof PullRequestMergeData
- || changeData instanceof PullRequestDiscardData
- || changeData instanceof PullRequestReopenData) {
- notifyWatchers = true;
- }
- } else if (!(event instanceof PullRequestMergePreviewCalculated
- || event instanceof PullRequestBuildEvent
- || event instanceof PullRequestReviewRequested
- || event instanceof PullRequestReviewerRemoved
- || event instanceof PullRequestAssigned
- || event instanceof PullRequestUnassigned)) {
- notifyWatchers = true;
- }
-
- if (notifyWatchers) {
- Collection<String> bccEmailAddresses = new HashSet<>();
-
- for (PullRequestWatch watch: request.getWatches()) {
- Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);
- if (watch.isWatching()
- && (visitDate == null || visitDate.before(event.getDate()))
- && (!(event instanceof PullRequestUpdated) || !watch.getUser().equals(request.getSubmitter()))
- && !notifiedUsers.contains(watch.getUser())
- && !isNotified(notifiedEmailAddresses, watch.getUser())) {
- EmailAddress emailAddress = watch.getUser().getPrimaryEmailAddress();
- if (emailAddress != null && emailAddress.isVerified())
- bccEmailAddresses.add(emailAddress.getValue());
- }
- }
+ @Override
+ protected PullRequest getEntity() {
+ return request;
+ }
+
+ @Override
+ protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
+ return userManager.query().stream().map(it->it.getPullRequestQueryPersonalization()).collect(Collectors.toList());
+ }
+
+ @Override
+ protected EntityQuery<PullRequest> parse(String queryString) {
+ return PullRequestQuery.parse(null, queryString);
+ }
- if (!bccEmailAddresses.isEmpty()) {
- String subject = String.format("[Pull Request %s] (%s) %s",
- request.getFQN(), (event instanceof PullRequestOpened)?"Opened":"Updated", request.getTitle());
- String threadingReferences = "<" + request.getUUID() + "@onedev>";
- Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(request));
- String htmlBody = getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, unsubscribable);
- String textBody = getTextBody(event, summary, event.getTextBody(), url, replyable, unsubscribable);
- mailManager.sendMailAsync(
- Lists.newArrayList(), Lists.newArrayList(),
- bccEmailAddresses, subject, htmlBody, textBody,
- replyAddress, threadingReferences);
+ @Override
+ protected Collection<? extends NamedQuery> getNamedQueries() {
+ return settingManager.getPullRequestSetting().getNamedQueries();
+ }
+
+ }.getWatches().entrySet()) {
+ pullRequestWatchManager.watch(request, entry.getKey(), entry.getValue());
+ }
+
+ Collection<User> notifiedUsers = Sets.newHashSet();
+ if (user != null) {
+ notifiedUsers.add(user); // no need to notify the user generating the event
+ if (!user.isSystem())
+ pullRequestWatchManager.watch(request, user, true);
+ }
+
+ User committer = null;
+ if (clone instanceof PullRequestUpdated) {
+ PullRequestUpdated pullRequestUpdated = (PullRequestUpdated) clone;
+ Collection<User> committers = pullRequestUpdated.getCommitters();
+ if (committers.size() == 1) {
+ committer = committers.iterator().next();
+ notifiedUsers.add(committer);
+ }
+ for (User each: committers) {
+ if (!each.isSystem())
+ pullRequestWatchManager.watch(request, each, true);
+ }
+ }
+
+ String summary;
+ if (user != null)
+ summary = user.getDisplayName() + " " + clone.getActivity();
+ else if (committer != null)
+ summary = committer.getDisplayName() + " " + clone.getActivity();
+ else
+ summary = StringUtils.capitalize(clone.getActivity());
+
+ String replyAddress = mailManager.getReplyAddress(request);
+ boolean replyable = replyAddress != null;
+
+ Set<User> reviewers = new HashSet<>();
+ Set<User> assignees = new HashSet<>();
+ if (clone instanceof PullRequestOpened) {
+ for (PullRequestReview review: request.getReviews()) {
+ if (review.getStatus() == Status.PENDING)
+ reviewers.add(review.getUser());
+ }
+ for (PullRequestAssignment assignment: request.getAssignments())
+ assignees.add(assignment.getUser());
+ } else if (clone instanceof PullRequestChanged) {
+ PullRequestChanged changeEvent = (PullRequestChanged) clone;
+ PullRequestChangeData changeData = changeEvent.getChange().getData();
+ if ((changeData instanceof PullRequestApproveData
+ || changeData instanceof PullRequestRequestedForChangesData
+ || changeData instanceof PullRequestDiscardData)
+ && request.getSubmitter() != null && !notifiedUsers.contains(request.getSubmitter())) {
+ String subject = String.format("[Pull Request %s] (%s) %s", request.getFQN(),
+ WordUtils.capitalize(changeData.getActivity()), request.getTitle());
+ String threadingReferences = String.format("<%s-%s@onedev>",
+ changeData.getActivity().replace(' ', '-'), request.getUUID());
+ EmailAddress emailAddress = request.getSubmitter().getPrimaryEmailAddress();
+ if (emailAddress != null && emailAddress.isVerified()) {
+ mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),
+ Lists.newArrayList(), Lists.newArrayList(), subject,
+ getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),
+ getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),
+ replyAddress, threadingReferences);
+ }
+ notifiedUsers.add(request.getSubmitter());
+ }
+ } else if (clone instanceof PullRequestAssigned) {
+ assignees.add(((PullRequestAssigned) clone).getAssignee());
+ } else if (clone instanceof PullRequestReviewRequested) {
+ reviewers.add(((PullRequestReviewRequested) clone).getReviewer());
+ }
+
+ for (User assignee: assignees) {
+ pullRequestWatchManager.watch(request, assignee, true);
+ if (!notifiedUsers.contains(assignee)) {
+ String subject = String.format("[Pull Request %s] (Assigned) %s",
+ request.getFQN(), request.getTitle());
+ String threadingReferences = String.format("<assigned-%s@onedev>", request.getUUID());
+ String assignmentSummary;
+ if (user != null)
+ assignmentSummary = user.getDisplayName() + " assigned to you";
+ else
+ assignmentSummary = "Assigned to you";
+ EmailAddress emailAddress = assignee.getPrimaryEmailAddress();
+ if (emailAddress != null && emailAddress.isVerified()) {
+ mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),
+ Lists.newArrayList(), Lists.newArrayList(), subject,
+ getHtmlBody(clone, assignmentSummary, clone.getHtmlBody(), url, replyable, null),
+ getTextBody(clone, assignmentSummary, clone.getTextBody(), url, replyable, null),
+ replyAddress, threadingReferences);
+ }
+ notifiedUsers.add(assignee);
+ }
+ }
+
+ for (User reviewer: reviewers) {
+ pullRequestWatchManager.watch(request, reviewer, true);
+ if (!notifiedUsers.contains(reviewer)) {
+ String subject = String.format("[Pull Request %s] (Review Request) %s",
+ request.getFQN(), request.getTitle());
+ String threadingReferences = String.format("<review-invitation-%s@onedev>", request.getUUID());
+ String reviewInvitationSummary;
+ if (user != null)
+ reviewInvitationSummary = user.getDisplayName() + " requested review from you";
+ else
+ reviewInvitationSummary = "Requested review from you";
+
+ EmailAddress emailAddress = reviewer.getPrimaryEmailAddress();
+ if (emailAddress != null && emailAddress.isVerified()) {
+ mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),
+ Lists.newArrayList(), Lists.newArrayList(), subject,
+ getHtmlBody(clone, reviewInvitationSummary, clone.getHtmlBody(), url, replyable, null),
+ getTextBody(clone, reviewInvitationSummary, clone.getTextBody(), url, replyable, null),
+ replyAddress, threadingReferences);
+ }
+ notifiedUsers.add(reviewer);
+ }
+ }
+
+ Collection<String> notifiedEmailAddresses;
+ if (clone instanceof PullRequestCommented)
+ notifiedEmailAddresses = ((PullRequestCommented) clone).getNotifiedEmailAddresses();
+ else
+ notifiedEmailAddresses = new ArrayList<>();
+
+ if (clone.getRenderedMarkdown() != null) {
+ for (String userName: new MentionParser().parseMentions(clone.getRenderedMarkdown())) {
+ User mentionedUser = userManager.findByName(userName);
+ if (mentionedUser != null) {
+ pullRequestWatchManager.watch(request, mentionedUser, true);
+ if (!isNotified(notifiedEmailAddresses, mentionedUser)) {
+ String subject = String.format("[Pull Request %s] (Mentioned You) %s", request.getFQN(), request.getTitle());
+ String threadingReferences = String.format("<mentioned-%s@onedev>", request.getUUID());
+
+ EmailAddress emailAddress = mentionedUser.getPrimaryEmailAddress();
+ if (emailAddress != null && emailAddress.isVerified()) {
+ mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),
+ Sets.newHashSet(), Sets.newHashSet(), subject,
+ getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),
+ getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),
+ replyAddress, threadingReferences);
+ }
+ notifiedUsers.add(mentionedUser);
+ }
+ }
+ }
+ }
+
+ boolean notifyWatchers = false;
+ if (clone instanceof PullRequestChanged) {
+ PullRequestChangeData changeData = ((PullRequestChanged) clone).getChange().getData();
+ if (changeData instanceof PullRequestApproveData
+ || changeData instanceof PullRequestRequestedForChangesData
+ || changeData instanceof PullRequestMergeData
+ || changeData instanceof PullRequestDiscardData
+ || changeData instanceof PullRequestReopenData) {
+ notifyWatchers = true;
+ }
+ } else if (!(clone instanceof PullRequestMergePreviewCalculated
+ || clone instanceof PullRequestBuildEvent
+ || clone instanceof PullRequestReviewRequested
+ || clone instanceof PullRequestReviewerRemoved
+ || clone instanceof PullRequestAssigned
+ || clone instanceof PullRequestUnassigned)) {
+ notifyWatchers = true;
+ }
+
+ if (notifyWatchers) {
+ Collection<String> bccEmailAddresses = new HashSet<>();
+
+ for (PullRequestWatch watch: request.getWatches()) {
+ Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);
+ Permission permission = new ProjectPermission(request.getProject(), new ReadCode());
+ if (watch.isWatching()
+ && (visitDate == null || visitDate.before(clone.getDate()))
+ && (!(clone instanceof PullRequestUpdated) || !watch.getUser().equals(request.getSubmitter()))
+ && !notifiedUsers.contains(watch.getUser())
+ && !isNotified(notifiedEmailAddresses, watch.getUser())
+ && watch.getUser().asSubject().isPermitted(permission)) {
+ EmailAddress emailAddress = watch.getUser().getPrimaryEmailAddress();
+ if (emailAddress != null && emailAddress.isVerified())
+ bccEmailAddresses.add(emailAddress.getValue());
+ }
+ }
+
+ if (!bccEmailAddresses.isEmpty()) {
+ String subject = String.format("[Pull Request %s] (%s) %s",
+ request.getFQN(), (clone instanceof PullRequestOpened)?"Opened":"Updated", request.getTitle());
+ String threadingReferences = "<" + request.getUUID() + "@onedev>";
+ Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(request));
+ String htmlBody = getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, unsubscribable);
+ String textBody = getTextBody(clone, summary, clone.getTextBody(), url, replyable, unsubscribable);
+ mailManager.sendMailAsync(
+ Lists.newArrayList(), Lists.newArrayList(),
+ bccEmailAddresses, subject, htmlBody, textBody,
+ replyAddress, threadingReferences);
+ }
+ }
+ }
+
+ });
+ return null;
+ }
+
+ });
+ }
+
+ });
}
- }
+
+ });
+
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java
index 1c4ba4e8ab..cfa7717383 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java
@@ -6,6 +6,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.inject.Inject;
@@ -133,7 +134,10 @@ public class DefaultIssueTextManager extends EntityTextManager<Issue> implements
projectQueryBuilder.setMinimumNumberShouldMatch(1);
queryBuilder.add(projectQueryBuilder.build(), Occur.MUST);
} else if (!SecurityUtils.isAdministrator()) {
- Collection<Long> projectIds = projectManager.getPermittedProjects(new AccessProject()).getIds();
+ Collection<Long> projectIds = projectManager.getPermittedProjects(new AccessProject()).stream()
+ .map(it->it.getId())
+ .collect(Collectors.toSet());
+
if (!projectIds.isEmpty())
queryBuilder.add(buildQuery(projectIds), Occur.MUST);
else
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java
index 792ce4e078..605a5fcae3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java
@@ -6,6 +6,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.inject.Inject;
@@ -36,7 +37,6 @@ import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.storage.StorageManager;
-import io.onedev.server.util.ProjectCollection;
import io.onedev.server.util.concurrent.BatchWorkManager;
import io.onedev.server.util.criteria.Criteria;
@@ -113,10 +113,13 @@ public class DefaultPullRequestTextManager extends EntityTextManager<PullRequest
if (project != null) {
queryBuilder.add(LongPoint.newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.MUST);
} else if (!SecurityUtils.isAdministrator()) {
- ProjectCollection projects = projectManager.getPermittedProjects(new ReadCode());
- if (!projects.getIds().isEmpty()) {
- Collection<Long> allIds = projects.getCache().getIds();
- queryBuilder.add(Criteria.forManyValues(FIELD_PROJECT_ID, projects.getIds(), allIds), Occur.MUST);
+ Collection<Project> projects = projectManager.getPermittedProjects(new ReadCode());
+ if (!projects.isEmpty()) {
+ Query projectsQuery = Criteria.forManyValues(
+ FIELD_PROJECT_ID,
+ projects.stream().map(it->it.getId()).collect(Collectors.toSet()),
+ projectManager.getIds());
+ queryBuilder.add(projectsQuery, Occur.MUST);
} else {
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
index 86032d54b7..ea0230f1b3 100644
--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
@@ -5,7 +5,6 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.Callable;
-import java.util.stream.Collectors;
import javax.annotation.Nullable;
@@ -74,13 +73,6 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
private static final Logger logger = LoggerFactory.getLogger(SecurityUtils.class);
- public static Collection<User> getAuthorizedUsers(Project project, Permission permission) {
- UserManager userManager = OneDev.getInstance(UserManager.class);
- return userManager.query().stream()
- .filter(it->it.asSubject().isPermitted(new ProjectPermission(project, permission)))
- .collect(Collectors.toList());
- }
-
@Nullable
public static User getUser() {
Long userId = getUserId();
@@ -114,7 +106,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
return true;
} else {
ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
- return !projectManager.getPermittedProjects(new CreateChildren()).getIds().isEmpty();
+ return !projectManager.getPermittedProjects(new CreateChildren()).isEmpty();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java
index 6cb372cacb..1c88917512 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
@@ -16,35 +17,33 @@ import org.apache.shiro.subject.PrincipalCollection;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.request.cycle.RequestCycle;
-import io.onedev.server.entitymanager.EmailAddressManager;
+import com.google.common.collect.Lists;
+
import io.onedev.server.entitymanager.GroupManager;
-import io.onedev.server.entitymanager.IssueAuthorizationManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Group;
+import io.onedev.server.model.IssueAuthorization;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.UserAuthorization;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.security.permission.ConfidentialIssuePermission;
import io.onedev.server.security.permission.ProjectPermission;
+import io.onedev.server.security.permission.SystemAdministration;
import io.onedev.server.security.permission.UserAdministration;
public abstract class AbstractAuthorizingRealm extends AuthorizingRealm {
protected final UserManager userManager;
- protected final EmailAddressManager emailAddressManager;
-
protected final GroupManager groupManager;
protected final ProjectManager projectManager;
protected final SessionManager sessionManager;
- private final IssueAuthorizationManager issueAuthorizationManager;
-
protected final SettingManager settingManager;
@SuppressWarnings("serial")
@@ -53,16 +52,12 @@ public abstract class AbstractAuthorizingRealm extends AuthorizingRealm {
@Inject
public AbstractAuthorizingRealm(UserManager userManager, GroupManager groupManager,
- ProjectManager projectManager, SessionManager sessionManager,
- SettingManager settingManager, EmailAddressManager emailAddressManager,
- IssueAuthorizationManager issueAuthorizationManager) {
+ ProjectManager projectManager, SessionManager sessionManager, SettingManager settingManager) {
this.userManager = userManager;
this.groupManager = groupManager;
this.projectManager = projectManager;
this.sessionManager = sessionManager;
this.settingManager = settingManager;
- this.emailAddressManager = emailAddressManager;
- this.issueAuthorizationManager = issueAuthorizationManager;
}
private AuthorizationInfo newAuthorizationInfo(Long userId) {
@@ -71,53 +66,55 @@ public abstract class AbstractAuthorizingRealm extends AuthorizingRealm {
@Override
public Collection<Permission> call() throws Exception {
Collection<Permission> permissions = new ArrayList<>();
- permissions.add(new Permission() {
+
+ if (userId != 0L) {
+ Permission systemAdministration = new SystemAdministration();
+
+ User user = userManager.load(userId);
+ if (user.isRoot() || user.isSystem())
+ return Lists.newArrayList(systemAdministration);
+
+ List<Group> groups = new ArrayList<>(user.getGroups());
+ Group defaultLoginGroup = settingManager.getSecuritySetting().getDefaultLoginGroup();
+ if (defaultLoginGroup != null)
+ groups.add(defaultLoginGroup);
+
+ for (Group group: groups) {
+ if (group.implies(systemAdministration))
+ return Lists.newArrayList(systemAdministration);
+ permissions.add(group);
+ }
+
+ permissions.add(new UserAdministration(user));
+
+ for (UserAuthorization authorization: user.getProjectAuthorizations())
+ permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));
+ for (IssueAuthorization authorization: user.getIssueAuthorizations()) {
+ permissions.add(new ProjectPermission(
+ authorization.getIssue().getProject(),
+ new ConfidentialIssuePermission(authorization.getIssue())));
+ }
+ }
+ if (userId != 0L || settingManager.getSecuritySetting().isEnableAnonymousAccess()) {
+ permissions.add(new Permission() {
- @Override
- public boolean implies(Permission p) {
- if (userId != 0L) {
- User user = userManager.load(userId);
- if (user.isRoot() || user.isSystem())
- return true;
- if (new UserAdministration(user).implies(p))
- return true;
- for (Group group: user.getGroups()) {
- if (group.implies(p))
- return true;
- }
- Group defaultLoginGroup = settingManager.getSecuritySetting().getDefaultLoginGroup();
- if (defaultLoginGroup != null && defaultLoginGroup.implies(p))
- return true;
-
- if (p instanceof ProjectPermission) {
+ @Override
+ public boolean implies(Permission p) {
+ if (p instanceof ProjectPermission) {
ProjectPermission projectPermission = (ProjectPermission) p;
- if (projectPermission.getPrivilege() instanceof ConfidentialIssuePermission) {
- ConfidentialIssuePermission confidentialIssuePermission =
- (ConfidentialIssuePermission) projectPermission.getPrivilege();
- if (issueAuthorizationManager.find(confidentialIssuePermission.getIssue(), user) != null)
+ Project project = projectPermission.getProject();
+ Permission privilege = projectPermission.getPrivilege();
+ do {
+ if (project.getDefaultRole() != null && project.getDefaultRole().implies(privilege))
return true;
- }
- for (UserAuthorization authorization: user.getProjectAuthorizations()) {
- if (new ProjectPermission(authorization.getProject(), authorization.getRole()).implies(p))
- return true;
- }
- }
- }
- if (p instanceof ProjectPermission
- && (userId != 0L || settingManager.getSecuritySetting().isEnableAnonymousAccess())) {
- ProjectPermission projectPermission = (ProjectPermission) p;
- Project project = projectPermission.getProject();
- Permission privilege = projectPermission.getPrivilege();
- do {
- if (project.getDefaultRole() != null && project.getDefaultRole().implies(privilege))
- return true;
- project = project.getParent();
- } while (project != null);
- }
- return false;
- }
-
- });
+ project = project.getParent();
+ } while (project != null);
+ }
+ return false;
+ }
+
+ });
+ }
return permissions;
}
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/BearerAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/BearerAuthorizingRealm.java
index b5930be62b..c07fbe1e9e 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/BearerAuthorizingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/realm/BearerAuthorizingRealm.java
@@ -8,9 +8,7 @@ import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authc.credential.AllowAllCredentialsMatcher;
-import io.onedev.server.entitymanager.EmailAddressManager;
import io.onedev.server.entitymanager.GroupManager;
-import io.onedev.server.entitymanager.IssueAuthorizationManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
@@ -22,11 +20,8 @@ public class BearerAuthorizingRealm extends AbstractAuthorizingRealm {
@Inject
public BearerAuthorizingRealm(UserManager userManager, GroupManager groupManager,
- ProjectManager projectManager, SessionManager sessionManager,
- SettingManager settingManager, EmailAddressManager emailAddressManager,
- IssueAuthorizationManager issueAuthorizationManager) {
- super(userManager, groupManager, projectManager, sessionManager,
- settingManager, emailAddressManager, issueAuthorizationManager);
+ ProjectManager projectManager, SessionManager sessionManager, SettingManager settingManager) {
+ super(userManager, groupManager, projectManager, sessionManager, settingManager);
setCredentialsMatcher(new AllowAllCredentialsMatcher());
}
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java
index 3a7b48ad65..654b23f765 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java
@@ -22,7 +22,6 @@ import com.google.common.collect.Sets;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.entitymanager.EmailAddressManager;
import io.onedev.server.entitymanager.GroupManager;
-import io.onedev.server.entitymanager.IssueAuthorizationManager;
import io.onedev.server.entitymanager.MembershipManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -46,15 +45,15 @@ public class PasswordAuthorizingRealm extends AbstractAuthorizingRealm {
private final SshKeyManager sshKeyManager;
+ private final EmailAddressManager emailAddressManager;
+
@Inject
public PasswordAuthorizingRealm(UserManager userManager, SettingManager settingManager,
MembershipManager membershipManager, GroupManager groupManager,
ProjectManager projectManager, SessionManager sessionManager,
TransactionManager transactionManager, SshKeyManager sshKeyManager,
- PasswordService passwordService, EmailAddressManager emailAddressManager,
- IssueAuthorizationManager issueAuthorizationManager) {
- super(userManager, groupManager, projectManager, sessionManager,
- settingManager, emailAddressManager, issueAuthorizationManager);
+ PasswordService passwordService, EmailAddressManager emailAddressManager) {
+ super(userManager, groupManager, projectManager, sessionManager, settingManager);
PasswordMatcher passwordMatcher = new PasswordMatcher();
passwordMatcher.setPasswordService(passwordService);
@@ -63,6 +62,7 @@ public class PasswordAuthorizingRealm extends AbstractAuthorizingRealm {
this.transactionManager = transactionManager;
this.membershipManager = membershipManager;
this.sshKeyManager = sshKeyManager;
+ this.emailAddressManager = emailAddressManager;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java
index 799e3bce5b..0ae5556191 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java
@@ -15,7 +15,6 @@ import com.google.common.collect.Sets;
import io.onedev.server.entitymanager.EmailAddressManager;
import io.onedev.server.entitymanager.GroupManager;
-import io.onedev.server.entitymanager.IssueAuthorizationManager;
import io.onedev.server.entitymanager.MembershipManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -36,19 +35,20 @@ public class SsoAuthorizingRealm extends AbstractAuthorizingRealm {
private final SshKeyManager sshKeyManager;
+ private final EmailAddressManager emailAddressManager;
+
@Inject
public SsoAuthorizingRealm(UserManager userManager, MembershipManager membershipManager,
GroupManager groupManager, ProjectManager projectManager, SessionManager sessionManager,
TransactionManager transactionManager, SshKeyManager sshKeyManager,
- SettingManager settingManager, EmailAddressManager emailAddressManager,
- IssueAuthorizationManager issueAuthorizationManager) {
- super(userManager, groupManager, projectManager, sessionManager, settingManager,
- emailAddressManager, issueAuthorizationManager);
+ SettingManager settingManager, EmailAddressManager emailAddressManager) {
+ super(userManager, groupManager, projectManager, sessionManager, settingManager);
setCredentialsMatcher(new AllowAllCredentialsMatcher());
this.membershipManager = membershipManager;
this.transactionManager = transactionManager;
this.sshKeyManager = sshKeyManager;
+ this.emailAddressManager = emailAddressManager;
}
private User newUser(SsoAuthenticated authenticated) {
diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectCollection.java b/server-core/src/main/java/io/onedev/server/util/ProjectCollection.java
deleted file mode 100644
index fe01d61c8b..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/ProjectCollection.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.onedev.server.util;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-public class ProjectCollection {
-
- private final ProjectCache cache;
-
- private final List<Long> ids;
-
- public ProjectCollection(ProjectCache cache, List<Long> ids) {
- this.cache = cache;
- this.ids = ids;
- }
-
- public ProjectCache getCache() {
- return cache;
- }
-
- public List<Long> getIds() {
- return ids;
- }
-
- public void sortByPath() {
- Collections.sort(ids, new Comparator<Long>() {
-
- @Override
- public int compare(Long o1, Long o2) {
- return cache.getPath(o1).compareTo(cache.getPath(o2));
- }
-
- });
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/match/MatchScoreUtils.java b/server-core/src/main/java/io/onedev/server/util/Similarities.java
similarity index 51%
rename from server-core/src/main/java/io/onedev/server/util/match/MatchScoreUtils.java
rename to server-core/src/main/java/io/onedev/server/util/Similarities.java
index 2af794287c..9058310c07 100644
--- a/server-core/src/main/java/io/onedev/server/util/match/MatchScoreUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/Similarities.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.match;
+package io.onedev.server.util;
import java.util.ArrayList;
import java.util.Collection;
@@ -10,23 +10,25 @@ import java.util.Map;
import javax.annotation.Nullable;
-public class MatchScoreUtils {
+public abstract class Similarities<T> extends ArrayList<T> {
- public static <T> List<T> filterAndSort(Collection<T> list, MatchScoreProvider<T> matchScoreProvider) {
- Map<T, Double> matchScores = new HashMap<>();
- List<T> newList = new ArrayList<>();
- for (T item: list) {
- double matchScore = matchScoreProvider.getMatchScore(item);
- if (matchScore > 0) {
- matchScores.put(item, matchScore);
- newList.add(item);
+ private static final long serialVersionUID = 1L;
+
+ public Similarities(Collection<T> collection) {
+ Map<T, Double> similarScores = new HashMap<>();
+ List<T> list = new ArrayList<>();
+ for (T item: collection) {
+ double similarScore = getSimilarScore(item);
+ if (similarScore > 0) {
+ similarScores.put(item, similarScore);
+ list.add(item);
}
}
- Collections.sort(newList, new Comparator<T>() {
+ Collections.sort(list, new Comparator<T>() {
@Override
public int compare(T o1, T o2) {
- double result = matchScores.get(o1) - matchScores.get(o2);
+ double result = similarScores.get(o1) - similarScores.get(o2);
if (result < 0)
return 1;
else if (result > 0)
@@ -36,11 +38,12 @@ public class MatchScoreUtils {
}
});
-
- return newList;
+ addAll(list);
}
-
- public static double getMatchScore(@Nullable String text, @Nullable String query) {
+
+ protected abstract double getSimilarScore(T item);
+
+ public static double getSimilarScore(@Nullable String text, @Nullable String query) {
if (query == null)
query = "";
else
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacade.java
new file mode 100644
index 0000000000..554669641d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacade.java
@@ -0,0 +1,54 @@
+package io.onedev.server.util.facade;
+
+import javax.annotation.Nullable;
+
+public class EmailAddressFacade extends EntityFacade {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String value;
+
+ private final boolean primary;
+
+ private final boolean git;
+
+ private final String verificationCode;
+
+ private final Long ownerId;
+
+ public EmailAddressFacade(Long id, String value, boolean primary, boolean git,
+ @Nullable String verificationCode, Long ownerId) {
+ super(id);
+ this.value = value;
+ this.primary = primary;
+ this.git = git;
+ this.verificationCode = verificationCode;
+ this.ownerId = ownerId;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public boolean isPrimary() {
+ return primary;
+ }
+
+ public boolean isGit() {
+ return git;
+ }
+
+ @Nullable
+ public String getVerificationCode() {
+ return verificationCode;
+ }
+
+ public Long getOwnerId() {
+ return ownerId;
+ }
+
+ public boolean isVerified() {
+ return getVerificationCode() == null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacades.java b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacades.java
new file mode 100644
index 0000000000..12bdc61884
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacades.java
@@ -0,0 +1,59 @@
+package io.onedev.server.util.facade;
+
+import java.util.HashMap;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jgit.lib.PersonIdent;
+
+import io.onedev.server.model.User;
+
+public class EmailAddressFacades extends HashMap<Long, EmailAddressFacade> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public EmailAddressFacades clone() {
+ EmailAddressFacades clone = new EmailAddressFacades();
+ clone.putAll(this);
+ return clone;
+ }
+
+ @Nullable
+ public EmailAddressFacade findByValue(String value) {
+ value = value.toLowerCase();
+ for (EmailAddressFacade facade: values()) {
+ if (facade.getValue().equals(value))
+ return facade;
+ }
+ return null;
+ }
+
+ @Nullable
+ public EmailAddressFacade findByPersonIdent(PersonIdent personIdent) {
+ if (StringUtils.isNotBlank(personIdent.getEmailAddress()))
+ return findByValue(personIdent.getEmailAddress());
+ else
+ return null;
+ }
+
+ @Nullable
+ public EmailAddressFacade findPrimary(User user) {
+ for (EmailAddressFacade facade: values()) {
+ if (facade.isPrimary() && facade.getOwnerId().equals(user.getId()))
+ return facade;
+ }
+ return null;
+ }
+
+ @Nullable
+ public EmailAddressFacade findGit(User user) {
+ for (EmailAddressFacade facade: values()) {
+ if (facade.isGit() && facade.getOwnerId().equals(user.getId()))
+ return facade;
+ }
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectCache.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java
similarity index 65%
rename from server-core/src/main/java/io/onedev/server/util/ProjectCache.java
rename to server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java
index aec6220bd6..9b16157ef1 100644
--- a/server-core/src/main/java/io/onedev/server/util/ProjectCache.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java
@@ -1,35 +1,35 @@
-package io.onedev.server.util;
+package io.onedev.server.util.facade;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
import javax.annotation.Nullable;
import com.google.common.base.Splitter;
import com.google.common.collect.Sets;
-import io.onedev.server.util.facade.ProjectFacade;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.Similarities;
import io.onedev.server.util.match.WildcardUtils;
-public class ProjectCache {
-
- private final Map<Long, ProjectFacade> projects;
-
- public ProjectCache(Map<Long, ProjectFacade> projects) {
- this.projects = projects;
- }
+public class ProjectCache extends HashMap<Long, ProjectFacade> {
+ private static final long serialVersionUID = 1L;
+
public boolean isSelfOrAncestorOf(Long parentId, Long childId) {
if (parentId.equals(childId)) {
return true;
} else {
- ProjectFacade childProject = projects.get(childId);
+ ProjectFacade childProject = get(childId);
if (childProject.getParentId() != null)
return isSelfOrAncestorOf(parentId, childProject.getParentId());
else
@@ -37,30 +37,9 @@ public class ProjectCache {
}
}
- public Collection<Long> getIds() {
- return projects.keySet();
- }
-
- public Collection<ProjectFacade> getAll() {
- return projects.values();
- }
-
- @Nullable
- public ProjectFacade get(Long id) {
- return projects.get(id);
- }
-
- public void cache(ProjectFacade project) {
- projects.put(project.getId(), project);
- }
-
- public void remove(Long id) {
- projects.remove(id);
- }
-
@Nullable
public String getPath(Long id) {
- ProjectFacade project = projects.get(id);
+ ProjectFacade project = get(id);
if (project != null) {
if (project.getParentId() != null) {
String parentPath = getPath(project.getParentId());
@@ -78,7 +57,7 @@ public class ProjectCache {
public Collection<Long> getMatchingIds(String pathPattern) {
Collection<Long> ids = new HashSet<>();
- for (Long id: projects.keySet()) {
+ for (Long id: keySet()) {
String path = getPath(id);
if (path != null && WildcardUtils.matchPath(pathPattern, path))
ids.add(id);
@@ -88,7 +67,7 @@ public class ProjectCache {
public Collection<Long> getSubtreeIds(Long id) {
Collection<Long> treeIds = Sets.newHashSet(id);
- for (ProjectFacade facade: projects.values()) {
+ for (ProjectFacade facade: values()) {
if (id.equals(facade.getParentId()))
treeIds.addAll(getSubtreeIds(facade.getId()));
}
@@ -108,7 +87,7 @@ public class ProjectCache {
@Nullable
public Long findId(@Nullable Long parentId, String name) {
- for (ProjectFacade project: projects.values()) {
+ for (ProjectFacade project: values()) {
if (project.getName().equalsIgnoreCase(name) && Objects.equals(parentId, project.getParentId()))
return project.getId();
}
@@ -117,7 +96,7 @@ public class ProjectCache {
public List<ProjectFacade> getChildren(Long id) {
List<ProjectFacade> children = new ArrayList<>();
- for (ProjectFacade facade: projects.values()) {
+ for (ProjectFacade facade: values()) {
if (id.equals(facade.getParentId()))
children.add(facade);
}
@@ -134,7 +113,30 @@ public class ProjectCache {
@Override
public ProjectCache clone() {
- return new ProjectCache(projects);
+ ProjectCache clone = new ProjectCache();
+ clone.putAll(this);
+ return clone;
+ }
+
+ public double getSimilarScore(Project project, @Nullable String term) {
+ String path = getPath(project.getId());
+ return Similarities.getSimilarScore(path, term);
+ }
+
+ public Collection<Project> getProjects() {
+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
+ return keySet().stream().map(it->projectManager.load(it)).collect(Collectors.toSet());
+ }
+
+ public Comparator<Project> comparingPath() {
+ return new Comparator<Project>() {
+
+ @Override
+ public int compare(Project o1, Project o2) {
+ return getPath(o1.getId()).compareTo(getPath(o2.getId()));
+ }
+
+ };
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/UserCache.java b/server-core/src/main/java/io/onedev/server/util/facade/UserCache.java
new file mode 100644
index 0000000000..f6afb52c0d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/facade/UserCache.java
@@ -0,0 +1,86 @@
+package io.onedev.server.util.facade;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.User;
+import io.onedev.server.util.Similarities;
+
+public class UserCache extends HashMap<Long, UserFacade> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Nullable
+ public UserFacade findByName(String name) {
+ name = name.toLowerCase();
+ for (UserFacade facade: values()) {
+ if (name.equals(facade.getName()))
+ return facade;
+ }
+ return null;
+ }
+
+ @Nullable
+ public UserFacade findByFullName(String fullName) {
+ for (UserFacade facade: values()) {
+ if (fullName.equals(facade.getFullName()))
+ return facade;
+ }
+ return null;
+ }
+
+ @Nullable
+ public UserFacade findByAccessToken(String accessToken) {
+ for (UserFacade facade: values()) {
+ if (accessToken.equals(facade.getAccessToken()))
+ return facade;
+ }
+ return null;
+ }
+
+ public double getSimilarScore(User user, @Nullable String term) {
+ UserFacade facade = get(user.getId());
+ double scoreOfName = Similarities.getSimilarScore(facade.getName(), term);
+ double scoreOfFullName = Similarities.getSimilarScore(facade.getFullName(), term);
+ return Math.max(scoreOfName, scoreOfFullName);
+ }
+
+ @Override
+ public UserCache clone() {
+ UserCache clone = new UserCache();
+ clone.putAll(this);
+ return clone;
+ }
+
+ public Collection<User> getUsers() {
+ UserManager userManager = OneDev.getInstance(UserManager.class);
+ return keySet().stream().filter(it->it>0).map(it->userManager.load(it)).collect(Collectors.toSet());
+ }
+
+ public Comparator<User> comparingDisplayName(Collection<User> topUsers) {
+ return new Comparator<User>() {
+
+ @Override
+ public int compare(User o1, User o2) {
+ if (topUsers.contains(o1)) {
+ if (topUsers.contains(o2))
+ return get(o1.getId()).getDisplayName().compareTo(get(o2.getId()).getDisplayName());
+ else
+ return -1;
+ } else if (topUsers.contains(o2)) {
+ return 1;
+ } else {
+ return get(o1.getId()).getDisplayName().compareTo(get(o2.getId()).getDisplayName());
+ }
+ }
+
+ };
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.java
new file mode 100644
index 0000000000..0b31bf4c22
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.java
@@ -0,0 +1,41 @@
+package io.onedev.server.util.facade;
+
+import javax.annotation.Nullable;
+
+public class UserFacade extends EntityFacade {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String name;
+
+ private final String fullName;
+
+ private final String accessToken;
+
+ public UserFacade(Long id, String name, @Nullable String fullName, String accessToken) {
+ super(id);
+ this.name = name;
+ this.fullName = fullName;
+ this.accessToken = accessToken;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getFullName() {
+ return fullName;
+ }
+
+ public String getAccessToken() {
+ return accessToken;
+ }
+
+ public String getDisplayName() {
+ if (getFullName() != null)
+ return getFullName();
+ else
+ return getName();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/match/MatchScoreProvider.java b/server-core/src/main/java/io/onedev/server/util/match/MatchScoreProvider.java
deleted file mode 100644
index 1ead35c520..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/match/MatchScoreProvider.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.onedev.server.util.match;
-
-public interface MatchScoreProvider<T> {
-
- double getMatchScore(T object);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
index ee606551eb..696e911723 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.behavior;
import static io.onedev.server.search.entity.project.ProjectQuery.getRuleName;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
@@ -27,7 +28,7 @@ import io.onedev.server.search.entity.project.ProjectQueryLexer;
import io.onedev.server.search.entity.project.ProjectQueryParser;
import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.ProjectCollection;
+import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
@@ -97,9 +98,10 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {
} else if (fieldName.equals(Project.NAME_SERVICE_DESK_NAME)) {
if (!matchWith.contains("*")) {
ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
- ProjectCollection projects = projectManager.getPermittedProjects(new AccessProject());
- List<String> serviceDeskNames = projects.getIds().stream()
- .map(it->projects.getCache().get(it).getServiceDeskName())
+ ProjectCache cache = projectManager.cloneCache();
+ Collection<Project> projects = projectManager.getPermittedProjects(new AccessProject());
+ List<String> serviceDeskNames = projects.stream()
+ .map(it->cache.get(it.getId()).getServiceDeskName())
.filter(it-> it != null)
.sorted()
.collect(Collectors.toList());
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java
index 010613ba65..ec3ecb4d51 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java
@@ -1,8 +1,6 @@
package io.onedev.server.web.component.branch.picker;
-import java.util.Iterator;
import java.util.List;
-import java.util.stream.Collectors;
import javax.annotation.Nullable;
@@ -15,7 +13,6 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.permission.ReadCode;
-import io.onedev.server.util.ProjectCollection;
import io.onedev.server.web.component.project.ProjectPicker;
@SuppressWarnings("serial")
@@ -64,21 +61,16 @@ public abstract class AffinalBranchPicker extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new ProjectPicker("projectPicker", new LoadableDetachableModel<ProjectCollection>() {
+ add(new ProjectPicker("projectPicker", new LoadableDetachableModel<List<Project>>() {
@Override
- protected ProjectCollection load() {
+ protected List<Project> load() {
Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);
List<Project> affinals = project.getForkRoot().getForkChildren();
affinals.add(0, project.getForkRoot());
- ProjectCollection projects = OneDev.getInstance(ProjectManager.class)
- .getPermittedProjects(new ReadCode());
- for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {
- if (!projects.getIds().contains(it.next().getId()))
- it.remove();
- }
- return new ProjectCollection(projects.getCache(),
- affinals.stream().map(it->it.getId()).collect(Collectors.toList()));
+ affinals.retainAll(OneDev.getInstance(ProjectManager.class).getPermittedProjects(new ReadCode()));
+
+ return affinals;
}
}) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index 034cd334a7..6c37c4dbbb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -51,6 +51,7 @@ import io.onedev.server.model.support.CompareContext;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.UrlUtils;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.WebSocketObserver;
@@ -87,6 +88,10 @@ public abstract class CodeCommentPanel extends Panel {
public CodeComment getComment() {
return OneDev.getInstance(CodeCommentManager.class).load(commentId);
}
+
+ private UserManager getUserManager() {
+ return OneDev.getInstance(UserManager.class);
+ }
private WebMarkupContainer newCommentOrReplyContainer() {
WebMarkupContainer viewFragment = new Fragment("comment", "commentOrReplyViewFrag", this);
@@ -181,7 +186,7 @@ public abstract class CodeCommentPanel extends Panel {
@Override
protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getComment().getParticipants());
+ return CodeCommentPanel.this.getMentionables();
}
};
@@ -488,7 +493,7 @@ public abstract class CodeCommentPanel extends Panel {
@Override
protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getComment().getParticipants());
+ return CodeCommentPanel.this.getMentionables();
}
};
@@ -670,6 +675,13 @@ public abstract class CodeCommentPanel extends Panel {
}
+ private List<User> getMentionables() {
+ UserCache cache = getUserManager().cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(getComment().getParticipants()));
+ return users;
+ }
+
public class CodeCommentReplyActivity implements CodeCommentActivity {
private final Long replyId;
@@ -775,7 +787,7 @@ public abstract class CodeCommentPanel extends Panel {
@Override
protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getComment().getParticipants());
+ return CodeCommentPanel.this.getMentionables();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 2b714a618b..765edf9a10 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -662,7 +662,7 @@ public abstract class RevisionDiffPanel extends Panel {
@Override
protected List<InputSuggestion> suggest(String matchWith) {
- return SuggestionUtils.suggestPaths(listOfInvolvedPaths, matchWith);
+ return SuggestionUtils.suggestByPattern(listOfInvolvedPaths, matchWith);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
index 7fcacf6aee..817f27ca59 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
@@ -37,7 +37,7 @@ public abstract class EntityWatchesPanel extends Panel {
private List<EntityWatch> getEffectWatches() {
List<EntityWatch> watches = new ArrayList<>();
for (EntityWatch watch: getEntity().getWatches()) {
- if (watch.isWatching())
+ if (watch.isWatching() && isAuthorized(watch.getUser()))
watches.add(watch);
}
Collections.sort(watches, new Comparator<EntityWatch>() {
@@ -51,6 +51,8 @@ public abstract class EntityWatchesPanel extends Panel {
return watches;
}
+ protected abstract boolean isAuthorized(User user);
+
@Override
protected void onInitialize() {
super.onInitialize();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java
index aad6759d1d..9d1a574a0c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java
@@ -6,8 +6,7 @@ import java.util.List;
import org.apache.wicket.model.IModel;
import io.onedev.server.model.Group;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.Similarities;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
@@ -30,16 +29,18 @@ public class GroupChoiceProvider extends AbstractGroupChoiceProvider {
@Override
public void query(String term, int page, Response<Group> response) {
- List<Group> matched = MatchScoreUtils.filterAndSort(choicesModel.getObject(), new MatchScoreProvider<Group>() {
+ List<Group> similarities = new Similarities<Group>(choicesModel.getObject()) {
+
+ private static final long serialVersionUID = 1L;
@Override
- public double getMatchScore(Group object) {
- return MatchScoreUtils.getMatchScore(object.getName(), term);
+ public double getSimilarScore(Group object) {
+ return Similarities.getSimilarScore(object.getName(), term);
}
- });
+ };
- new ResponseFiller<Group>(response).fill(matched, page, WebConstants.PAGE_SIZE);
+ new ResponseFiller<Group>(response).fill(similarities, page, WebConstants.PAGE_SIZE);
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index 87a6a2a254..d1fb587667 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -43,6 +43,7 @@ import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.issue.activities.activity.IssueActivity;
@@ -232,7 +233,10 @@ public abstract class IssueActivitiesPanel extends Panel {
@Override
protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getIssue().getParticipants());
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(getIssue().getParticipants()));
+ return users;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
index e696910bc8..d7742e417d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.issue.activities.activity;
+import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -19,6 +20,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.project.comment.CommentPanel;
@@ -75,8 +77,10 @@ class IssueCommentedPanel extends GenericPanel<IssueComment> {
@Override
protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(
- IssueCommentedPanel.this.getComment().getIssue().getParticipants());
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(IssueCommentedPanel.this.getComment().getIssue().getParticipants()));
+ return users;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
index 421c828574..b2bf18a86e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.issue.activities.activity;
+import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -16,6 +17,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.project.comment.CommentPanel;
@@ -52,7 +54,10 @@ class IssueOpenedPanel extends GenericPanel<Issue> {
@Override
protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getIssue().getParticipants());
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(getIssue().getParticipants()));
+ return users;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java
index a6220183e7..0b9d1ff86b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java
@@ -4,10 +4,8 @@ import static io.onedev.server.model.IssueAuthorization.PROP_ISSUE;
import static io.onedev.server.model.IssueAuthorization.PROP_USER;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.stream.Collectors;
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.Session;
@@ -35,6 +33,8 @@ import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
+import com.google.common.collect.Sets;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueAuthorizationManager;
import io.onedev.server.entitymanager.UserManager;
@@ -43,8 +43,8 @@ import io.onedev.server.model.IssueAuthorization;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.Similarities;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
@@ -73,10 +73,13 @@ public abstract class IssueAuthorizationsPanel extends Panel {
private EntityCriteria<IssueAuthorization> getCriteria() {
EntityCriteria<IssueAuthorization> criteria =
EntityCriteria.of(IssueAuthorization.class);
- if (query != null)
- criteria.createCriteria(PROP_USER).add(Restrictions.ilike(User.PROP_NAME, query, MatchMode.ANYWHERE));
- else
+ if (query != null) {
+ criteria.createCriteria(PROP_USER).add(Restrictions.or(
+ Restrictions.ilike(User.PROP_NAME, query, MatchMode.ANYWHERE),
+ Restrictions.ilike(User.PROP_FULL_NAME, query, MatchMode.ANYWHERE)));
+ } else {
criteria.setCacheable(true);
+ }
criteria.add(Restrictions.eq(PROP_ISSUE, getIssue()));
return criteria;
}
@@ -104,22 +107,22 @@ public abstract class IssueAuthorizationsPanel extends Panel {
@Override
public void query(String term, int page, Response<User> response) {
- List<User> notAuthorized = OneDev.getInstance(UserManager.class).query();
- notAuthorized.removeAll(getIssue().getAuthorizations().stream()
- .map(it->it.getUser()).collect(Collectors.toList()));
- Collections.sort(notAuthorized);
- Collections.reverse(notAuthorized);
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.removeAll(getIssue().getAuthorizedUsers());
+ users.sort(cache.comparingDisplayName(Sets.newHashSet()));
- notAuthorized = MatchScoreUtils.filterAndSort(notAuthorized, new MatchScoreProvider<User>() {
+ users = new Similarities<User>(users) {
@Override
- public double getMatchScore(User object) {
- return object.getMatchScore(term);
+ public double getSimilarScore(User object) {
+ return cache.getSimilarScore(object, term);
}
- });
+ };
- new ResponseFiller<>(response).fill(notAuthorized, page, WebConstants.PAGE_SIZE);
+ new ResponseFiller<>(response).fill(users, page, WebConstants.PAGE_SIZE);
}
}) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 383c45aa49..23360b912e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -82,8 +82,8 @@ import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.LinkSide;
-import io.onedev.server.util.ProjectCollection;
import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;
import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener.AttachMode;
@@ -432,19 +432,23 @@ public abstract class IssueListPanel extends Panel {
@Override
protected Component newContent(String id, FloatingPanel dropdown) {
- return new ProjectSelector(id, new LoadableDetachableModel<ProjectCollection>() {
+ return new ProjectSelector(id, new LoadableDetachableModel<List<Project>>() {
@Override
- protected ProjectCollection load() {
- ProjectCollection collection = OneDev.getInstance(ProjectManager.class)
- .getPermittedProjects(new AccessProject());
+ protected List<Project> load() {
+ List<Project> projects = new ArrayList<>(getProjectManger().getPermittedProjects(new AccessProject()));
- Predicate<Long> issueManagementPredicate =
- item -> collection.getCache().get(item).isIssueManagement();
-
- CollectionUtils.filter(collection.getIds(), issueManagementPredicate);
- collection.sortByPath();
- return collection;
+ ProjectCache cache = getProjectManger().cloneCache();
+ CollectionUtils.filter(projects, new Predicate<Project>() {
+
+ @Override
+ public boolean evaluate(Project object) {
+ return cache.get(object.getId()).isIssueManagement();
+ }
+
+ });
+ projects.sort(cache.comparingPath());
+ return projects;
}
}) {
@@ -653,10 +657,10 @@ public abstract class IssueListPanel extends Panel {
@Override
protected Component newContent(String id, FloatingPanel dropdown2) {
- return new ProjectSelector(id, new LoadableDetachableModel<ProjectCollection>() {
+ return new ProjectSelector(id, new LoadableDetachableModel<List<Project>>() {
@Override
- protected ProjectCollection load() {
+ protected List<Project> load() {
return getTargetProjects();
}
@@ -876,10 +880,10 @@ public abstract class IssueListPanel extends Panel {
@Override
protected Component newContent(String id, FloatingPanel dropdown2) {
- return new ProjectSelector(id, new LoadableDetachableModel<ProjectCollection>() {
+ return new ProjectSelector(id, new LoadableDetachableModel<List<Project>>() {
@Override
- protected ProjectCollection load() {
+ protected List<Project> load() {
return getTargetProjects();
}
@@ -1011,15 +1015,24 @@ public abstract class IssueListPanel extends Panel {
return menuItems;
}
- private ProjectCollection getTargetProjects() {
- ProjectCollection projects = OneDev.getInstance(ProjectManager.class).getPermittedProjects(new AccessProject());
+ private List<Project> getTargetProjects() {
+ Collection<Project> collection = getProjectManger().getPermittedProjects(new AccessProject());
+ ProjectCache cache = getProjectManger().cloneCache();
- Predicate<Long> issueManagementPredicate =
- item -> projects.getCache().get(item).isIssueManagement();
- CollectionUtils.filter(projects.getIds(), issueManagementPredicate);
- projects.getIds().remove(getProject().getId());
- projects.sortByPath();
- return projects;
+ CollectionUtils.filter(collection, new Predicate<Project>() {
+
+ @Override
+ public boolean evaluate(Project object) {
+ return cache.get(object.getId()).isIssueManagement();
+ }
+
+ });
+ collection.remove(getProject());
+
+ List<Project> list = new ArrayList<>(collection);
+ list.sort(cache.comparingPath());
+
+ return list;
}
@Override
@@ -1346,6 +1359,10 @@ public abstract class IssueListPanel extends Panel {
setOutputMarkupId(true);
}
+ private ProjectManager getProjectManger() {
+ return OneDev.getInstance(ProjectManager.class);
+ }
+
@Nullable
private ProjectScope getProjectScope() {
if (getProject() != null)
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 701a42d5d7..eb036bf123 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -64,8 +64,7 @@ import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.LinkSide;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.Similarities;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
@@ -129,6 +128,11 @@ public abstract class IssueSidePanel extends Panel {
protected AbstractEntity getEntity() {
return getIssue();
}
+
+ @Override
+ protected boolean isAuthorized(User user) {
+ return SecurityUtils.canAccess(user.asSubject(), getIssue());
+ }
});
@@ -581,15 +585,14 @@ public abstract class IssueSidePanel extends Panel {
List<Milestone> milestones = getProject().getSortedHierarchyMilestones();
milestones.removeAll(getIssue().getMilestones());
- milestones = MatchScoreUtils.filterAndSort(
- milestones, new MatchScoreProvider<Milestone>() {
+ milestones = new Similarities<Milestone>(milestones) {
@Override
- public double getMatchScore(Milestone object) {
- return MatchScoreUtils.getMatchScore(object.getName(), term);
+ public double getSimilarScore(Milestone object) {
+ return Similarities.getSimilarScore(object.getName(), term);
}
- });
+ };
new ResponseFiller<Milestone>(response).fill(milestones, page, WebConstants.PAGE_SIZE);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java
index 844ac6328d..ebbcf9f98b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.component.issue.transitionoption;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -29,6 +30,7 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.field.FieldUtils;
import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
@@ -91,7 +93,10 @@ public abstract class TransitionOptionPanel extends Panel {
@Override
protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getIssue().getParticipants());
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(getIssue().getParticipants()));
+ return users;
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java
index 0553c72864..cfba75fd59 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/choice/MilestoneChoiceProvider.java
@@ -6,8 +6,7 @@ import java.util.List;
import org.apache.wicket.model.IModel;
import io.onedev.server.model.Milestone;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.Similarities;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
@@ -30,15 +29,16 @@ public class MilestoneChoiceProvider extends AbstractMilestoneChoiceProvider {
@Override
public void query(String term, int page, Response<Milestone> response) {
- List<Milestone> milestones = MatchScoreUtils.filterAndSort(choicesModel.getObject(),
- new MatchScoreProvider<Milestone>() {
+ List<Milestone> milestones = new Similarities<Milestone>(choicesModel.getObject()) {
+
+ private static final long serialVersionUID = 1L;
@Override
- public double getMatchScore(Milestone object) {
- return MatchScoreUtils.getMatchScore(object.getName(), term);
+ public double getSimilarScore(Milestone object) {
+ return Similarities.getSimilarScore(object.getName(), term);
}
- });
+ };
new ResponseFiller<Milestone>(response).fill(milestones, page, WebConstants.PAGE_SIZE);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java b/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java
index 5a8bb5b875..e41542978b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.component.project;
+import java.util.List;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.model.IModel;
@@ -7,7 +9,6 @@ import org.apache.wicket.model.Model;
import org.unbescape.html.HtmlEscape;
import io.onedev.server.model.Project;
-import io.onedev.server.util.ProjectCollection;
import io.onedev.server.web.asset.icon.IconScope;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
@@ -17,9 +18,9 @@ import io.onedev.server.web.component.svg.SpriteImage;
@SuppressWarnings("serial")
public abstract class ProjectPicker extends DropdownLink {
- private final IModel<ProjectCollection> projectsModel;
+ private final IModel<List<Project>> projectsModel;
- public ProjectPicker(String id, IModel<ProjectCollection> projectsModel) {
+ public ProjectPicker(String id, IModel<List<Project>> projectsModel) {
super(id);
this.projectsModel = projectsModel;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java
deleted file mode 100644
index 4de9f8d263..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.onedev.server.web.component.project.choice;
-
-import java.util.Collection;
-import java.util.stream.Collectors;
-
-import org.hibernate.Hibernate;
-import org.json.JSONException;
-import org.json.JSONWriter;
-import org.unbescape.html.HtmlEscape;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.web.avatar.AvatarManager;
-import io.onedev.server.web.component.select2.ChoiceProvider;
-
-@SuppressWarnings("serial")
-public abstract class AbstractProjectChoiceProvider extends ChoiceProvider<Project> {
-
- @Override
- public void toJson(Project choice, JSONWriter writer) throws JSONException {
- writer.key("id").value(choice.getId());
- writer.key("path");
- writer.value(HtmlEscape.escapeHtml5(choice.getPath()));
- String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(choice.getId());
- writer.key("avatar").value(avatarUrl);
- }
-
- @Override
- public Collection<Project> toChoices(Collection<String> ids) {
- return ids.stream()
- .map(it -> {
- Project project = OneDev.getInstance(ProjectManager.class).load(Long.valueOf(it));
- Hibernate.initialize(project);
- return project;
- }
- ).collect(Collectors.toList());
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java
index 743f3a9762..1f3765d42a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java
@@ -2,26 +2,59 @@ package io.onedev.server.web.component.project.choice;
import java.util.Collection;
import java.util.List;
+import java.util.stream.Collectors;
import org.apache.wicket.model.IModel;
+import org.hibernate.Hibernate;
+import org.json.JSONException;
+import org.json.JSONWriter;
+import org.unbescape.html.HtmlEscape;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.Similarities;
+import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.avatar.AvatarManager;
+import io.onedev.server.web.component.select2.ChoiceProvider;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
-public class ProjectChoiceProvider extends AbstractProjectChoiceProvider {
+public class ProjectChoiceProvider extends ChoiceProvider<Project> {
private static final long serialVersionUID = 1L;
- private final IModel<Collection<Project>> choicesModel;
+ private final IModel<List<Project>> choicesModel;
- public ProjectChoiceProvider(IModel<Collection<Project>> choicesModel) {
+ public ProjectChoiceProvider(IModel<List<Project>> choicesModel) {
this.choicesModel = choicesModel;
}
+ @Override
+ public void toJson(Project choice, JSONWriter writer) throws JSONException {
+ writer.key("id").value(choice.getId());
+ writer.key("path");
+ writer.value(HtmlEscape.escapeHtml5(choice.getPath()));
+ String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(choice.getId());
+ writer.key("avatar").value(avatarUrl);
+ }
+
+ @Override
+ public Collection<Project> toChoices(Collection<String> ids) {
+ return ids.stream()
+ .map(it -> {
+ Project project = getProjectManager().load(Long.valueOf(it));
+ Hibernate.initialize(project);
+ return project;
+ }
+ ).collect(Collectors.toList());
+ }
+
+ private ProjectManager getProjectManager() {
+ return OneDev.getInstance(ProjectManager.class);
+ }
+
@Override
public void detach() {
choicesModel.detach();
@@ -30,16 +63,22 @@ public class ProjectChoiceProvider extends AbstractProjectChoiceProvider {
@Override
public void query(String term, int page, Response<Project> response) {
- List<Project> matched = MatchScoreUtils.filterAndSort(choicesModel.getObject(), new MatchScoreProvider<Project>() {
+ List<Project> projects = choicesModel.getObject();
+
+ ProjectCache cache = getProjectManager().cloneCache();
+
+ List<Project> similarities = new Similarities<Project>(projects) {
+
+ private static final long serialVersionUID = 1L;
@Override
- public double getMatchScore(Project object) {
- return MatchScoreUtils.getMatchScore(object.getPath(), term);
+ public double getSimilarScore(Project object) {
+ return cache.getSimilarScore(object, term);
}
- });
+ };
- new ResponseFiller<Project>(response).fill(matched, page, WebConstants.PAGE_SIZE);
+ new ResponseFiller<Project>(response).fill(similarities, page, WebConstants.PAGE_SIZE);
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectMultiChoice.java
index 39b86b6566..5bc1ab479b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectMultiChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectMultiChoice.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.component.project.choice;
import java.util.Collection;
+import java.util.List;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -13,8 +14,8 @@ public class ProjectMultiChoice extends Select2MultiChoice<Project> {
private static final long serialVersionUID = 1L;
- public ProjectMultiChoice(String id, IModel<Collection<Project>> model, AbstractProjectChoiceProvider choiceProvider) {
- super(id, model, choiceProvider);
+ public ProjectMultiChoice(String id, IModel<Collection<Project>> model, IModel<List<Project>> choicesModel) {
+ super(id, model, new ProjectChoiceProvider(choicesModel));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.java
index 7a070179fa..9a89c54900 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectSingleChoice.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.component.project.choice;
+import java.util.List;
+
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
@@ -10,8 +12,8 @@ import io.onedev.server.web.component.select2.Select2Choice;
@SuppressWarnings("serial")
public class ProjectSingleChoice extends Select2Choice<Project> {
- public ProjectSingleChoice(String id, IModel<Project> model, AbstractProjectChoiceProvider choiceProvider) {
- super(id, model, choiceProvider);
+ public ProjectSingleChoice(String id, IModel<Project> model, IModel<List<Project>> choicesModel) {
+ super(id, model, new ProjectChoiceProvider(choicesModel));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
index 8436912836..0a93a08982 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
@@ -20,8 +20,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.Similarities;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.component.markdown.AtWhoReferenceSupport;
import io.onedev.server.web.component.markdown.MarkdownEditor;
import io.onedev.server.web.component.markdown.UserMentionSupport;
@@ -40,28 +40,35 @@ public abstract class CommentInput extends MarkdownEditor {
@Override
public List<User> findUsers(String query, int count) {
List<User> mentionables = getMentionables();
- List<User> filtered = MatchScoreUtils.filterAndSort(mentionables, new MatchScoreProvider<User>() {
+ UserCache cache = getUserManager().cloneCache();
+
+ List<User> similarities = new Similarities<User>(mentionables) {
@Override
- public double getMatchScore(User object) {
- return object.getMatchScore(query)
- * (mentionables.size() - mentionables.indexOf(object))
- / mentionables.size();
+ public double getSimilarScore(User object) {
+ return cache.getSimilarScore(object, query);
}
- });
+ };
- if (filtered.size() > count)
- return filtered.subList(0, count);
+ if (similarities.size() > count)
+ return similarities.subList(0, count);
else
- return filtered;
+ return similarities;
}
};
}
+ private UserManager getUserManager() {
+ return OneDev.getInstance(UserManager.class);
+ }
+
protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(Sets.newHashSet());
+ UserCache cache = getUserManager().cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(Sets.newHashSet()));
+ return users;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentPanel.java
index d2c40375bb..feb443441c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.project.comment;
+import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
@@ -29,6 +30,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.component.markdown.AttachmentSupport;
@@ -246,7 +248,10 @@ public abstract class CommentPanel extends Panel {
protected abstract DeleteCallback getDeleteCallback();
protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(Sets.newHashSet());
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(Sets.newHashSet()));
+ return users;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index 95f655659a..88a41d4bea 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -78,10 +78,10 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.CreateChildren;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.ProjectBuildStats;
-import io.onedev.server.util.ProjectCollection;
import io.onedev.server.util.ProjectIssueStats;
import io.onedev.server.util.ProjectPullRequestStats;
import io.onedev.server.util.facade.ProjectFacade;
+import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.ProjectQueryBehavior;
@@ -346,10 +346,10 @@ public class ProjectListPanel extends Panel {
@Override
protected Component newContent(String id, FloatingPanel dropdown2) {
- return new ProjectSelector(id, new LoadableDetachableModel<ProjectCollection>() {
+ return new ProjectSelector(id, new LoadableDetachableModel<List<Project>>() {
@Override
- protected ProjectCollection load() {
+ protected List<Project> load() {
return getTargetProjects();
}
@@ -605,10 +605,10 @@ public class ProjectListPanel extends Panel {
@Override
protected Component newContent(String id, FloatingPanel dropdown2) {
- return new ProjectSelector(id, new LoadableDetachableModel<ProjectCollection>() {
+ return new ProjectSelector(id, new LoadableDetachableModel<List<Project>>() {
@Override
- protected ProjectCollection load() {
+ protected List<Project> load() {
return getTargetProjects();
}
@@ -859,9 +859,10 @@ public class ProjectListPanel extends Panel {
return menuItems;
}
- private ProjectCollection getTargetProjects() {
- ProjectCollection projects = getProjectManager().getPermittedProjects(new CreateChildren());
- projects.sortByPath();
+ private List<Project> getTargetProjects() {
+ ProjectCache cache = getProjectManager().cloneCache();
+ List<Project> projects = new ArrayList<>(getProjectManager().getPermittedProjects(new CreateChildren()));
+ projects.sort(cache.comparingPath());
return projects;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html
index e3a9aaf34d..9b15248ee2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html
@@ -13,6 +13,6 @@
</a>
</li>
</ul>
- <div wicket:id="noProjects" class="no-projects alert alert-notice alert-light-warning mb-0 mt-4">No Projects Found</div>
+ <div wicket:id="noProjects" class="no-projects mb-0 mt-4"><div class=" alert alert-notice alert-light-warning">No Projects Found</div></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java
index 1e585f59c6..5b20daca0e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java
@@ -6,34 +6,32 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.CallbackParameter;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
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.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.request.IRequestParameters;
-import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.util.ProjectCollection;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.util.Similarities;
+import io.onedev.server.util.facade.ProjectCache;
+import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;
import io.onedev.server.web.behavior.InputChangeBehavior;
+import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;
import io.onedev.server.web.component.link.PreventDefaultAjaxLink;
import io.onedev.server.web.component.project.avatar.ProjectAvatar;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
@@ -41,13 +39,33 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;
@SuppressWarnings("serial")
public abstract class ProjectSelector extends Panel {
- private final IModel<ProjectCollection> projectsModel;
+ private final IModel<List<Project>> projectsModel;
- private ListView<Long> projectsView;
+ private final IModel<List<Project>> similarProjectsModel = new LoadableDetachableModel<List<Project>>() {
+
+ @Override
+ protected List<Project> load() {
+ ProjectCache cache = getProjectManager().cloneCache();
+
+ return new Similarities<Project>(projectsModel.getObject()) {
+
+ @Override
+ protected double getSimilarScore(Project item) {
+ return cache.getSimilarScore(item, searchInput);
+ }
+
+ };
+ }
+
+ };
+
+ private RepeatingView projectsView;
+
+ private TextField<String> searchField;
private String searchInput;
- public ProjectSelector(String id, IModel<ProjectCollection> projectsModel) {
+ public ProjectSelector(String id, IModel<List<Project>> projectsModel) {
super(id);
this.projectsModel = projectsModel;
@@ -59,13 +77,51 @@ public abstract class ProjectSelector extends Panel {
WebMarkupContainer projectsContainer = new WebMarkupContainer("projects") {
+ @Override
+ protected void onBeforeRender() {
+ projectsView = new RepeatingView("projects");
+ int index = 0;
+ for (Project project: similarProjectsModel.getObject()) {
+ Component item = newItem(projectsView.newChildId(), project);
+ if (index == 0)
+ item.add(AttributeAppender.append("class", "active"));
+ projectsView.add(item);
+ if (++index >= WebConstants.PAGE_SIZE)
+ break;
+ }
+ addOrReplace(projectsView);
+
+ super.onBeforeRender();
+ }
+
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(!projectsView.getModelObject().isEmpty());
+ setVisible(!similarProjectsModel.getObject().isEmpty());
}
};
+
+ projectsContainer.add(new InfiniteScrollBehavior(WebConstants.PAGE_SIZE) {
+
+ @Override
+ protected void appendMore(AjaxRequestTarget target, int offset, int count) {
+ for (int i=offset; i<offset+count; i++) {
+ if (i >= similarProjectsModel.getObject().size())
+ break;
+ Project project = similarProjectsModel.getObject().get(i);
+
+ Component item = newItem(projectsView.newChildId(), project);
+ projectsView.add(item);
+ String script = String.format("$('#%s').append('<li id=\"%s\"></li>');",
+ projectsContainer.getMarkupId(), item.getMarkupId());
+ target.prependJavaScript(script);
+ target.add(item);
+ }
+ }
+
+ });
+
projectsContainer.setOutputMarkupPlaceholderTag(true);
add(projectsContainer);
@@ -74,102 +130,66 @@ public abstract class ProjectSelector extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(projectsView.getModelObject().isEmpty());
+ setVisible(similarProjectsModel.getObject().isEmpty());
}
};
noProjectsContainer.setOutputMarkupPlaceholderTag(true);
add(noProjectsContainer);
- TextField<String> searchField = new TextField<String>("search", Model.of(""));
+ searchField = new TextField<String>("search", Model.of(""));
add(searchField);
searchField.add(new InputChangeBehavior() {
@Override
protected void onInputChange(AjaxRequestTarget target) {
searchInput = searchField.getInput();
+
target.add(projectsContainer);
target.add(noProjectsContainer);
}
- });
- searchField.add(new AbstractPostAjaxBehavior() {
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
- Long id = params.getParameterValue("id").toLong();
- onSelect(target, OneDev.getInstance(ProjectManager.class).load(id));
- }
-
- @Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
-
- String script = String.format("onedev.server.projectSelector.init('%s', %s)",
- searchField.getMarkupId(true),
- getCallbackFunction(CallbackParameter.explicit("id")));
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
});
- projectsContainer.add(projectsView = new ListView<Long>("projects",
- new LoadableDetachableModel<List<Long>>() {
+ setOutputMarkupId(true);
+ }
+
+ private Component newItem(String componentId, Project project) {
+ WebMarkupContainer item = new WebMarkupContainer(componentId);
+
+ Long projectId = project.getId();
+ AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {
@Override
- protected List<Long> load() {
- MatchScoreProvider<Long> matchScoreProvider = new MatchScoreProvider<Long>() {
-
- @Override
- public double getMatchScore(Long object) {
- return MatchScoreUtils.getMatchScore(
- projectsModel.getObject().getCache().getPath(object), searchInput);
- }
-
- };
-
- return MatchScoreUtils.filterAndSort(projectsModel.getObject().getIds(), matchScoreProvider);
+ public void onClick(AjaxRequestTarget target) {
+ onSelect(target, getProjectManager().load(projectId));
}
- }) {
-
@Override
- protected void populateItem(ListItem<Long> item) {
- Long projectId = item.getModelObject();
- AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- Project project = OneDev.getInstance(ProjectManager.class).load(projectId);
- onSelect(target, project);
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
-
- PageParameters params = ProjectBlobPage.paramsOf(item.getModelObject());
- tag.put("href", urlFor(ProjectBlobPage.class, params).toString());
- }
-
- };
- if (projectId.equals(Project.idOf(getCurrent())))
- link.add(AttributeAppender.append("class", " current"));
- link.add(new ProjectAvatar("avatar", projectId));
- link.add(new Label("path", projectsModel.getObject().getCache().getPath(projectId)));
- item.add(link);
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
- if (item.getIndex() == 0)
- item.add(AttributeAppender.append("class", "active"));
- item.add(AttributeAppender.append("data-id", projectId));
+ PageParameters params = ProjectBlobPage.paramsOf(getProjectManager().load(projectId));
+ tag.put("href", urlFor(ProjectBlobPage.class, params).toString());
}
- });
+ };
+ if (project.equals(getCurrent()))
+ link.add(AttributeAppender.append("class", " current"));
+ link.add(new ProjectAvatar("avatar", projectId));
+ link.add(new Label("path", project.getPath()));
+ item.add(link);
+
+ return item;
+ }
+
+ private ProjectManager getProjectManager() {
+ return OneDev.getInstance(ProjectManager.class);
}
@Override
protected void onDetach() {
+ similarProjectsModel.detach();
projectsModel.detach();
super.onDetach();
@@ -179,7 +199,11 @@ public abstract class ProjectSelector extends Panel {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new ProjectSelectorResourceReference()));
+ response.render(JavaScriptHeaderItem.forReference(new SelectByTypingResourceReference()));
+ response.render(CssHeaderItem.forReference(new ProjectSelectorCssResourceReference()));
+
+ String script = String.format("$('#%s').selectByTyping($('#%s'));", searchField.getMarkupId(), getMarkupId());
+ response.render(OnDomReadyHeaderItem.forScript(script));
}
@Nullable
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelectorCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelectorCssResourceReference.java
new file mode 100644
index 0000000000..f2cef14ee7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelectorCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.project.selector;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class ProjectSelectorCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public ProjectSelectorCssResourceReference() {
+ super(ProjectSelectorCssResourceReference.class, "project-selector.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelectorResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelectorResourceReference.java
deleted file mode 100644
index 85ceaac17f..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelectorResourceReference.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.onedev.server.web.component.project.selector;
-
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.HeaderItem;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.request.resource.CssResourceReference;
-
-import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class ProjectSelectorResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ProjectSelectorResourceReference() {
- super(ProjectSelectorResourceReference.class, "project-selector.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
- ProjectSelectorResourceReference.class, "project-selector.css")));
- return dependencies;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css b/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css
index f4bacb7e7d..92590ee3c2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.css
@@ -1,3 +1,6 @@
+.project-selector .projects, .project-selector .no-projects {
+ height: 400px;
+}
.project-selector input {
padding-right: 2rem;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.js b/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.js
deleted file mode 100644
index a5bc0847c1..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/project-selector.js
+++ /dev/null
@@ -1,39 +0,0 @@
-onedev.server.projectSelector = {
- init: function(inputId, callback) {
- var $input = $("#" + inputId);
-
- $input.closest(".floating").on("open", function() {
- $input.focus();
- });
-
- var $container = $input.closest(".project-selector");
-
- $input.bind("keydown", "return", function() {
- var id = $container.find("li.project.active").data("id");
- if (id)
- callback(id);
- });
-
- $input.bind("keydown", "up", function(e) {
- e.preventDefault();
- var $active = $container.find("li.project.active");
- var $prev = $active.prev("li.project");
- if ($prev.length != 0) {
- $active.removeClass("active");
- $prev.addClass("active");
- }
- $("li.project.active")[0].scrollIntoViewIfNeeded(false);
- });
-
- $input.bind("keydown", "down", function(e) {
- e.preventDefault();
- var $active = $container.find("li.project.active");
- var $next = $active.next("li.project");
- if ($next.length != 0) {
- $active.removeClass("active");
- $next.addClass("active");
- }
- $("li.project.active")[0].scrollIntoViewIfNeeded(false);
- });
- }
-};
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeProvider.java
index 95b28e9513..4150a6c8ea 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeProvider.java
@@ -1,17 +1,15 @@
package io.onedev.server.web.component.pullrequest.assignment;
-import static io.onedev.server.util.match.MatchScoreUtils.filterAndSort;
-
+import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.WriteCode;
-import io.onedev.server.util.match.MatchScoreProvider;
+import io.onedev.server.util.Similarities;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
@@ -24,20 +22,25 @@ public abstract class AssigneeProvider extends AbstractUserChoiceProvider {
@Override
public void query(String term, int page, Response<User> response) {
PullRequest request = getPullRequest();
- List<User> assignees = OneDev.getInstance(UserManager.class).queryAndSort(request.getParticipants());
- assignees.retainAll(SecurityUtils.getAuthorizedUsers(request.getTargetProject(), new WriteCode()));
- assignees.removeAll(request.getAssignments().stream().map(it->it.getUser()).collect(Collectors.toSet()));
-
- new ResponseFiller<User>(response).fill(filterAndSort(assignees, new MatchScoreProvider<User>() {
+ UserManager userManager = OneDev.getInstance(UserManager.class);
+
+ List<User> users = new ArrayList<>(userManager.getAuthorizedUsers(request.getProject(), new WriteCode()));
+
+ users.removeAll(request.getAssignees());
+
+ UserCache cache = userManager.cloneCache();
+ users.sort(cache.comparingDisplayName(request.getParticipants()));
+
+ new ResponseFiller<User>(response).fill(new Similarities<User>(users) {
+
+ private static final long serialVersionUID = 1L;
@Override
- public double getMatchScore(User object) {
- return object.getMatchScore(term)
- * (assignees.size() - assignees.indexOf(object))
- / assignees.size();
+ public double getSimilarScore(User object) {
+ return cache.getSimilarScore(object, term);
}
- }), page, WebConstants.PAGE_SIZE);
+ }, page, WebConstants.PAGE_SIZE);
}
protected abstract PullRequest getPullRequest();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 2d9e77cdef..fe22a5ee58 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -61,7 +61,6 @@ import io.onedev.server.search.entitytext.PullRequestTextManager;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.ProjectCollection;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.asset.emoji.Emojis;
@@ -629,13 +628,13 @@ public abstract class PullRequestListPanel extends Panel {
@Override
protected Component newContent(String id, FloatingPanel dropdown) {
- return new ProjectSelector(id, new LoadableDetachableModel<ProjectCollection>() {
+ return new ProjectSelector(id, new LoadableDetachableModel<List<Project>>() {
@Override
- protected ProjectCollection load() {
- ProjectCollection projects = OneDev.getInstance(ProjectManager.class)
- .getPermittedProjects(new ReadCode());
- projects.sortByPath();
+ protected List<Project> load() {
+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
+ List<Project> projects = new ArrayList<Project>(projectManager.getPermittedProjects(new ReadCode()));
+ projects.sort(projectManager.cloneCache().comparingPath());
return projects;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.java
index 5977a34c99..0165a8d65c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.java
@@ -1,7 +1,6 @@
package io.onedev.server.web.component.pullrequest.review;
-import static io.onedev.server.util.match.MatchScoreUtils.filterAndSort;
-
+import java.util.ArrayList;
import java.util.List;
import io.onedev.server.OneDev;
@@ -9,7 +8,8 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
-import io.onedev.server.util.match.MatchScoreProvider;
+import io.onedev.server.util.Similarities;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
@@ -23,23 +23,26 @@ public abstract class ReviewerProvider extends AbstractUserChoiceProvider {
public void query(String term, int page, Response<User> response) {
PullRequest request = getPullRequest();
- List<User> reviewers = OneDev.getInstance(UserManager.class).queryAndSort(request.getParticipants());
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(request.getParticipants()));
+
for (PullRequestReview review: request.getReviews()) {
if (review.getStatus() != PullRequestReview.Status.EXCLUDED)
- reviewers.remove(review.getUser());
+ users.remove(review.getUser());
}
- reviewers.remove(request.getSubmitter());
+ users.remove(request.getSubmitter());
- new ResponseFiller<User>(response).fill(filterAndSort(reviewers, new MatchScoreProvider<User>() {
+ new ResponseFiller<User>(response).fill(new Similarities<User>(users) {
+
+ private static final long serialVersionUID = 1L;
@Override
- public double getMatchScore(User object) {
- return object.getMatchScore(term)
- * (reviewers.size() - reviewers.indexOf(object))
- / reviewers.size();
+ public double getSimilarScore(User object) {
+ return cache.getSimilarScore(object, term);
}
- }), page, WebConstants.PAGE_SIZE);
+ }, page, WebConstants.PAGE_SIZE);
}
protected abstract PullRequest getPullRequest();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java
index 384abb826a..51fd7619c6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java
@@ -1,8 +1,6 @@
package io.onedev.server.web.component.revisionpicker;
-import java.util.Iterator;
import java.util.List;
-import java.util.stream.Collectors;
import javax.annotation.Nullable;
@@ -15,7 +13,6 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.permission.ReadCode;
-import io.onedev.server.util.ProjectCollection;
import io.onedev.server.web.component.project.ProjectPicker;
@SuppressWarnings("serial")
@@ -64,22 +61,16 @@ public abstract class AffinalRevisionPicker extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new ProjectPicker("projectPicker", new LoadableDetachableModel<ProjectCollection>() {
+ add(new ProjectPicker("projectPicker", new LoadableDetachableModel<List<Project>>() {
@Override
- protected ProjectCollection load() {
+ protected List<Project> load() {
Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);
List<Project> affinals = project.getForkRoot().getForkChildren();
affinals.add(0, project.getForkRoot());
+ affinals.retainAll(OneDev.getInstance(ProjectManager.class).getPermittedProjects(new ReadCode()));
- ProjectCollection projects = OneDev.getInstance(ProjectManager.class)
- .getPermittedProjects(new ReadCode());
- for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {
- if (!projects.getIds().contains(it.next().getId()))
- it.remove();
- }
- return new ProjectCollection(projects.getCache(),
- affinals.stream().map(it->it.getId()).collect(Collectors.toList()));
+ return affinals;
}
}) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
index b26b5f0a48..b4d8b59a3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
@@ -1,7 +1,5 @@
package io.onedev.server.web.component.revisionpicker;
-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -28,8 +26,6 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.request.IRequestParameters;
-import org.apache.wicket.request.cycle.RequestCycle;
import org.eclipse.jgit.errors.AmbiguousObjectException;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.RevisionSyntaxException;
@@ -48,7 +44,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.InputChangeBehavior;
import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;
import io.onedev.server.web.component.createtag.CreateTagPanel;
@@ -107,7 +102,8 @@ public abstract class RevisionSelector extends Panel {
revInput = null;
target.add(revField);
newItemsView(target);
- String script = String.format("onedev.server.revisionSelector.bindInputKeys('%s');", getMarkupId(true));
+ String script = String.format("$('#%s input').selectByTyping($('#%s'));",
+ getMarkupId(true), getMarkupId(true));
target.appendJavaScript(script);
target.focusComponent(revField);
}
@@ -185,36 +181,6 @@ public abstract class RevisionSelector extends Panel {
feedback.setOutputMarkupPlaceholderTag(true);
add(feedback);
- add(new AbstractPostAjaxBehavior() {
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
- String value = params.getParameterValue("value").toString();
- if (StringUtils.isNotBlank(value)) {
- if (value.startsWith(COMMIT_FLAG)) {
- selectRevision(target, value.substring(COMMIT_FLAG.length()));
- } else if (value.startsWith(ADD_FLAG)) {
- value = value.substring(ADD_FLAG.length());
- onCreateRef(target, value);
- } else {
- selectRevision(target, value);
- }
- } else if (StringUtils.isNotBlank(revInput)) {
- selectRevision(target, revInput.trim());
- }
- }
-
- @Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
- String script = String.format("onedev.server.revisionSelector.init('%s', %s);",
- getMarkupId(true), getCallbackFunction(explicit("value")));
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
- });
-
revField.add(new InputChangeBehavior() {
@Override
@@ -406,7 +372,6 @@ public abstract class RevisionSelector extends Panel {
link.add(new WebMarkupContainer("icon"));
WebMarkupContainer item = new WebMarkupContainer(itemId);
item.setOutputMarkupId(true);
- item.add(AttributeAppender.append("data-value", HtmlEscape.escapeHtml5(itemValue)));
item.add(link);
return item;
@@ -486,6 +451,9 @@ public abstract class RevisionSelector extends Panel {
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(new RevisionSelectorResourceReference()));
+
+ String script = String.format("onedev.server.revisionSelector.onDomReady('%s');", getMarkupId(true));
+ response.render(OnDomReadyHeaderItem.forScript(script));
}
protected abstract void onSelect(AjaxRequestTarget target, String revision);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java
index f2780e54dd..37094c358f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;
+import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
public class RevisionSelectorResourceReference extends BaseDependentResourceReference {
@@ -21,8 +21,9 @@ public class RevisionSelectorResourceReference extends BaseDependentResourceRefe
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(RevisionSelectorResourceReference.class, "revision-selector.css")));
+ dependencies.add(JavaScriptHeaderItem.forReference(new SelectByTypingResourceReference()));
+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(
+ RevisionSelectorResourceReference.class, "revision-selector.css")));
return dependencies;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js
index ff7bfcf423..318d5cd1e6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js
@@ -1,43 +1,10 @@
onedev.server.revisionSelector = {
- init: function(containerId, callback) {
+ onDomReady: function(containerId) {
var $container = $("#" + containerId);
- $container.data("callback", callback);
var $floating = $container.closest(".floating");
$floating.on("open click", function() {
$container.find("input").focus();
});
- onedev.server.revisionSelector.bindInputKeys(containerId);
- },
- bindInputKeys: function(containerId) {
- var $container = $("#" + containerId);
- var callback = $container.data("callback");
- var $input = $container.find("input");
- $input.bind("keydown", "return", function() {
- var $active = $container.find("ul.items li.active");
- if ($active.length != 0)
- callback($active.data("value"));
- else
- callback();
- });
- $input.bind("keydown", "up", function(e) {
- e.preventDefault();
- var $active = $container.find("ul.items li.active");
- var $prev = $active.prev("li:not(.loading-indicator)");
- if ($prev.length != 0) {
- $active.removeClass("active");
- $prev.addClass("active");
- }
- $container.find("ul.items li.active")[0].scrollIntoViewIfNeeded(false);
- });
- $input.bind("keydown", "down", function(e) {
- e.preventDefault();
- var $active = $container.find("ul.items li.active");
- var $next = $active.next("li:not(.loading-indicator)");
- if ($next.length != 0) {
- $active.removeClass("active");
- $next.addClass("active");
- }
- $container.find("ul.items li.active")[0].scrollIntoViewIfNeeded(false);
- });
+ $container.find("input").selectByTyping($container);
}
};
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java b/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java
index 2ba886391b..d9e23ff4ab 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java
@@ -241,7 +241,6 @@ abstract class AbstractSelect2Choice<T, M> extends HiddenField<M> implements IRe
@Override
public void onResourceRequested() {
-
// this is the callback that retrieves matching choices used to populate
// the dropdown
@@ -282,7 +281,7 @@ abstract class AbstractSelect2Choice<T, M> extends HiddenField<M> implements IRe
} catch (JSONException e) {
throw new RuntimeException("Could not write Json response", e);
}
-
+
try {
out.flush();
} catch (IOException e) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/ResponseFiller.java b/server-core/src/main/java/io/onedev/server/web/component/select2/ResponseFiller.java
index 59431e6ea0..c804696472 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/select2/ResponseFiller.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/ResponseFiller.java
@@ -21,7 +21,7 @@ public class ResponseFiller<T> {
from = to;
}
response.addAll(values.subList(from, to));
- response.setHasMore(to<values.size());
+ response.setHasMore(to < values.size());
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
index f2b81e03aa..4081a2c142 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
@@ -10,8 +10,7 @@ import org.apache.wicket.model.IModel;
import org.json.JSONException;
import org.json.JSONWriter;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.Similarities;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.select2.ChoiceProvider;
import io.onedev.server.web.component.select2.Response;
@@ -56,24 +55,26 @@ public class StringChoiceProvider extends ChoiceProvider<String> {
@Override
public void query(String term, int page, Response<String> response) {
- List<String> matched;
+ List<String> similarities;
if (StringUtils.isNotBlank(term)) {
Map<String, String> choices = choicesModel.getObject();
- matched = MatchScoreUtils.filterAndSort(choices.keySet(), new MatchScoreProvider<String>() {
+ similarities = new Similarities<String>(choices.keySet()) {
+
+ private static final long serialVersionUID = 1L;
@Override
- public double getMatchScore(String object) {
- return MatchScoreUtils.getMatchScore(choices.get(object), term);
+ public double getSimilarScore(String object) {
+ return Similarities.getSimilarScore(choices.get(object), term);
}
- });
+ };
- if (tagsMode && !matched.contains(term))
- matched.add(term);
+ if (tagsMode && !similarities.contains(term))
+ similarities.add(term);
} else {
- matched = new ArrayList<>(choicesModel.getObject().keySet());
+ similarities = new ArrayList<>(choicesModel.getObject().keySet());
}
- new ResponseFiller<String>(response).fill(matched, page, WebConstants.PAGE_SIZE);
+ new ResponseFiller<String>(response).fill(similarities, page, WebConstants.PAGE_SIZE);
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java
index 70f0612174..cc02d59a30 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java
@@ -1,13 +1,14 @@
package io.onedev.server.web.component.user.choice;
-import java.util.Collection;
import java.util.List;
import org.apache.wicket.model.IModel;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.Similarities;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
@@ -16,9 +17,9 @@ public class UserChoiceProvider extends AbstractUserChoiceProvider {
private static final long serialVersionUID = 1L;
- private final IModel<Collection<User>> choicesModel;
+ private final IModel<List<User>> choicesModel;
- public UserChoiceProvider(IModel<Collection<User>> choicesModel) {
+ public UserChoiceProvider(IModel<List<User>> choicesModel) {
this.choicesModel = choicesModel;
}
@@ -30,16 +31,23 @@ public class UserChoiceProvider extends AbstractUserChoiceProvider {
@Override
public void query(String term, int page, Response<User> response) {
- List<User> matched = MatchScoreUtils.filterAndSort(choicesModel.getObject(), new MatchScoreProvider<User>() {
+ List<User> users = choicesModel.getObject();
+ UserManager userManager = OneDev.getInstance(UserManager.class);
+
+ UserCache cache = userManager.cloneCache();
+
+ List<User> similarities = new Similarities<User>(users) {
+
+ private static final long serialVersionUID = 1L;
@Override
- public double getMatchScore(User object) {
- return object.getMatchScore(term);
+ public double getSimilarScore(User object) {
+ return cache.getSimilarScore(object, term);
}
- });
+ };
- new ResponseFiller<User>(response).fill(matched, page, WebConstants.PAGE_SIZE);
+ new ResponseFiller<User>(response).fill(similarities, page, WebConstants.PAGE_SIZE);
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.java
index 65b8eedc75..e8b821170f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserMultiChoice.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.component.user.choice;
import java.util.Collection;
+import java.util.List;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -13,7 +14,8 @@ public class UserMultiChoice extends Select2MultiChoice<User> {
private static final long serialVersionUID = 1L;
- public UserMultiChoice(String id, IModel<Collection<User>> selectionsModel, IModel<Collection<User>>choicesModel) {
+ public UserMultiChoice(String id, IModel<Collection<User>> selectionsModel,
+ IModel<List<User>> choicesModel) {
super(id, selectionsModel, new UserChoiceProvider(choicesModel));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java
index 9b83e62579..16f132da18 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/choice/UserSingleChoice.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.user.choice;
-import java.util.Collection;
+import java.util.List;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -12,7 +12,7 @@ import io.onedev.server.web.component.select2.Select2Choice;
@SuppressWarnings("serial")
public class UserSingleChoice extends Select2Choice<User> {
- public UserSingleChoice(String id, IModel<User> selectionModel, IModel<Collection<User>> choicesModel) {
+ public UserSingleChoice(String id, IModel<User> selectionModel, IModel<List<User>> choicesModel) {
super(id, selectionModel, new UserChoiceProvider(choicesModel));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java
index 3547029828..800ebf91b3 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java
@@ -39,8 +39,7 @@ import io.onedev.commons.utils.StringUtils;
import io.onedev.server.buildspec.BuildSpecAware;
import io.onedev.server.buildspec.ParamSpecAware;
import io.onedev.server.buildspec.step.Step;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.Similarities;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
@@ -327,30 +326,28 @@ abstract class StepEditPanel extends Panel implements BuildSpecAware, ParamSpecA
NestedTree<TreeNode> tree;
if (searchInput != null) {
- MatchScoreProvider<TreeNode> matchScoreProvider = new MatchScoreProvider<TreeNode>() {
+ List<TreeNode> similarNodes = new Similarities<TreeNode>(nodes) {
@Override
- public double getMatchScore(TreeNode object) {
- String fullName = object.getName();
- if (object instanceof StepNode) {
- StepNode stepNode = (StepNode) object;
+ protected double getSimilarScore(TreeNode item) {
+ String fullName = item.getName();
+ if (item instanceof StepNode) {
+ StepNode stepNode = (StepNode) item;
String groupName = EditableUtils.getGroup(stepNode.stepClass);
if (groupName != null)
fullName = groupName + "/" + fullName;
}
- return MatchScoreUtils.getMatchScore(
+ return Similarities.getSimilarScore(
StringUtils.deleteWhitespace(fullName),
StringUtils.deleteWhitespace(searchInput));
}
};
- List<TreeNode> matchNodes = MatchScoreUtils.filterAndSort(nodes, matchScoreProvider);
-
List<TreeNode> filteredNodes = new ArrayList<>();
Set<String> addedGroups = new HashSet<>();
- for (TreeNode matchNode: matchNodes) {
+ for (TreeNode matchNode: similarNodes) {
if (matchNode instanceof StepNode) {
StepNode currentNode = (StepNode) matchNode;
filteredNodes.add(currentNode);
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java
index 514ff15e39..83ca2fb59c 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java
@@ -1,19 +1,23 @@
package io.onedev.server.web.editable.parentchoice;
+import java.util.ArrayList;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
+import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.security.permission.CreateChildren;
-import io.onedev.server.util.ProjectCollection;
+import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.web.component.stringchoice.StringSingleChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
@@ -32,19 +36,34 @@ public class ParentChoiceEditor extends PropertyEditor<String> {
protected void onInitialize() {
super.onInitialize();
- Map<String, String> projectPaths = new LinkedHashMap<>();
- Project currentProject = Project.get();
- ProjectCollection projects = OneDev.getInstance(ProjectManager.class)
- .getPermittedProjects(new CreateChildren());
- for (Long projectId: projects.getIds()) {
- if (currentProject == null || !projects.getCache().isSelfOrAncestorOf(currentProject.getId(), projectId)) {
- String projectPath = projects.getCache().getPath(projectId);
- projectPaths.put(projectPath, projectPath);
+ IModel<Map<String, String>> choicesModel = new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ List<String> listOfProjectPath = new ArrayList<>();
+ Project currentProject = Project.get();
+
+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
+ ProjectCache cache = projectManager.cloneCache();
+ for (Project project: projectManager.getPermittedProjects(new CreateChildren())) {
+ if (currentProject == null || !cache.isSelfOrAncestorOf(currentProject.getId(), project.getId())) {
+ String projectPath = cache.getPath(project.getId());
+ listOfProjectPath.add(projectPath);
+ }
+ }
+ Collections.sort(listOfProjectPath);
+
+ Map<String, String> mapOfProjectPath = new LinkedHashMap<>();
+ for (String projectPath: listOfProjectPath)
+ mapOfProjectPath.put(projectPath, projectPath);
+ return mapOfProjectPath;
}
- }
+
+ };
+
String selection = getModelObject();
- input = new StringSingleChoice("input", Model.of(selection), Model.ofMap(projectPaths), true) {
+ input = new StringSingleChoice("input", Model.of(selection), choicesModel, true) {
@Override
protected void onInitialize() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java
index 9d31ba805d..13b56c9590 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java
@@ -14,7 +14,7 @@ import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.web.component.project.choice.ProjectChoiceProvider;
+import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.web.component.project.choice.ProjectMultiChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
@@ -22,11 +22,14 @@ import io.onedev.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
public class ProjectMultiChoiceEditor extends PropertyEditor<List<String>> {
- private final IModel<Collection<Project>> choicesModel = new LoadableDetachableModel<Collection<Project>>() {
+ private final IModel<List<Project>> choicesModel = new LoadableDetachableModel<List<Project>>() {
@Override
- protected Collection<Project> load() {
- return OneDev.getInstance(ProjectManager.class).query();
+ protected List<Project> load() {
+ ProjectCache cache = getProjectManager().cloneCache();
+ List<Project> projects = new ArrayList<>(cache.getProjects());
+ projects.sort(cache.comparingPath());
+ return projects;
}
};
@@ -43,6 +46,10 @@ public class ProjectMultiChoiceEditor extends PropertyEditor<List<String>> {
choicesModel.detach();
super.onDetach();
}
+
+ private ProjectManager getProjectManager() {
+ return OneDev.getInstance(ProjectManager.class);
+ }
@Override
protected void onInitialize() {
@@ -50,15 +57,14 @@ public class ProjectMultiChoiceEditor extends PropertyEditor<List<String>> {
List<Project> selections = new ArrayList<>();
if (getModelObject() != null) {
- ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
for (String projectPath: getModelObject()) {
- Project project = projectManager.findByPath(projectPath);
- if (project != null && choicesModel.getObject().contains(project))
- selections.add(project);
+ Project selection = getProjectManager().findByPath(projectPath);
+ if (selection != null)
+ selections.add(selection);
}
}
- input = new ProjectMultiChoice("input", Model.of(selections), new ProjectChoiceProvider(choicesModel)) {
+ input = new ProjectMultiChoice("input", Model.of(selections), choicesModel) {
@Override
protected void onInitialize() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java
index fd2d75f2eb..8e46128af1 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java
@@ -1,18 +1,19 @@
package io.onedev.server.web.editable.project.choice;
-import java.util.Comparator;
+import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.web.component.project.choice.ProjectChoiceProvider;
+import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.web.component.project.choice.ProjectSingleChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
@@ -20,33 +21,40 @@ import io.onedev.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
public class ProjectSingleChoiceEditor extends PropertyEditor<String> {
+ private final IModel<List<Project>> choicesModel = new LoadableDetachableModel<List<Project>>() {
+
+ @Override
+ protected List<Project> load() {
+ ProjectCache cache = getProjectManager().cloneCache();
+ List<Project> projects = new ArrayList<>(cache.getProjects());
+ projects.sort(cache.comparingPath());
+ return projects;
+ }
+
+ };
+
private ProjectSingleChoice input;
public ProjectSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,
IModel<String> propertyModel) {
super(id, propertyDescriptor, propertyModel);
}
+
+ private ProjectManager getProjectManager() {
+ return OneDev.getInstance(ProjectManager.class);
+ }
@Override
protected void onInitialize() {
super.onInitialize();
- List<Project> projects = OneDev.getInstance(ProjectManager.class).query();
- projects.sort(Comparator.comparing(Project::getPath));
-
- Project project;
- if (getModelObject() != null)
- project = OneDev.getInstance(ProjectManager.class).findByPath(getModelObject());
- else
- project = null;
-
Project selection;
- if (project != null && projects.contains(project))
- selection = project;
- else
+ if (getModelObject() != null)
+ selection = getProjectManager().findByPath(getModelObject());
+ else
selection = null;
- input = new ProjectSingleChoice("input", Model.of(selection), new ProjectChoiceProvider(Model.of(projects))) {
+ input = new ProjectSingleChoice("input", Model.of(selection), choicesModel) {
@Override
protected void onInitialize() {
@@ -79,6 +87,12 @@ public class ProjectSingleChoiceEditor extends PropertyEditor<String> {
return null;
}
+ @Override
+ protected void onDetach() {
+ choicesModel.detach();
+ super.onDetach();
+ }
+
@Override
public boolean needExplicitSubmit() {
return false;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java
index b94bcb478e..3f72a19745 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java
@@ -20,6 +20,8 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.component.user.choice.UserMultiChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
@@ -40,7 +42,9 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {
protected void onInitialize() {
super.onInitialize();
- List<User> choices = new ArrayList<>();
+ UserCache cache = getUserManager().cloneCache();
+
+ List<Long> choiceIds;
ComponentContext componentContext = new ComponentContext(this);
ComponentContext.push(componentContext);
@@ -48,28 +52,34 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {
UserChoice userChoice = descriptor.getPropertyGetter().getAnnotation(UserChoice.class);
Preconditions.checkNotNull(userChoice);
if (userChoice.value().length() != 0) {
- choices.addAll((List<User>)ReflectionUtils
- .invokeStaticMethod(descriptor.getBeanClass(), userChoice.value()));
+ List<User> users = (List<User>) ReflectionUtils
+ .invokeStaticMethod(descriptor.getBeanClass(), userChoice.value());
+ choiceIds = users.stream().map(it->it.getId()).collect(Collectors.toList());
} else {
- choices.addAll(getUserManager().query());
- choices.sort(Comparator.comparing(User::getDisplayName));
+ choiceIds = new ArrayList<>(cache.keySet());
+ choiceIds.removeIf(it->it<0);
+ choiceIds.sort(new Comparator<Long>() {
+
+ @Override
+ public int compare(Long o1, Long o2) {
+ return cache.get(o1).getDisplayName().compareTo(cache.get(o2).getDisplayName());
+ }
+
+ });
}
} finally {
ComponentContext.pop();
}
- List<User> selections = new ArrayList<>();
+ List<Long> selectionIds = new ArrayList<>();
if (getModelObject() != null) {
for (String userName: getModelObject()) {
- User user = getUserManager().findByName(userName);
- if (user != null && choices.contains(user))
- selections.add(user);
+ UserFacade user = cache.findByName(userName);
+ if (user != null && choiceIds.contains(user.getId()))
+ selectionIds.add(user.getId());
}
}
- List<Long> choiceIds = choices.stream().map(it->it.getId()).collect(Collectors.toList());
- List<Long> selectionIds = selections.stream().map(it->it.getId()).collect(Collectors.toList());
-
input = new UserMultiChoice("input", new IModel<Collection<User>>() {
@Override
@@ -88,11 +98,11 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {
selectionIds.addAll(object.stream().map(it->it.getId()).collect(Collectors.toList()));
}
- }, new LoadableDetachableModel<Collection<User>>() {
+ }, new LoadableDetachableModel<List<User>>() {
@Override
- protected Collection<User> load() {
- return choiceIds.stream().map(it-> getUserManager().load(it)).collect(Collectors.toList());
+ protected List<User> load() {
+ return choiceIds.stream().map(it->getUserManager().load(it)).collect(Collectors.toList());
}
}) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
index f8fbfd521c..729f9b35d4 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
@@ -1,7 +1,6 @@
package io.onedev.server.web.editable.userchoice;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
@@ -21,6 +20,8 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.util.facade.UserCache;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.component.user.choice.UserSingleChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
@@ -45,7 +46,9 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {
protected void onInitialize() {
super.onInitialize();
- List<User> choices = new ArrayList<>();
+ UserCache cache = getUserManager().cloneCache();
+
+ List<Long> choiceIds;
ComponentContext componentContext = new ComponentContext(this);
ComponentContext.push(componentContext);
@@ -53,30 +56,32 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {
UserChoice userChoice = descriptor.getPropertyGetter().getAnnotation(UserChoice.class);
Preconditions.checkNotNull(userChoice);
if (userChoice.value().length() != 0) {
- choices.addAll((List<User>)ReflectionUtils
- .invokeStaticMethod(descriptor.getBeanClass(), userChoice.value()));
+ List<User> users = (List<User>) ReflectionUtils
+ .invokeStaticMethod(descriptor.getBeanClass(), userChoice.value());
+ choiceIds = users.stream().map(it->it.getId()).collect(Collectors.toList());
} else {
- choices.addAll(getUserManager().query());
- choices.sort(Comparator.comparing(User::getDisplayName));
+ choiceIds = new ArrayList<>(cache.keySet());
+ choiceIds.removeIf(it->it<0);
+ choiceIds.sort(new Comparator<Long>() {
+
+ @Override
+ public int compare(Long o1, Long o2) {
+ return cache.get(o1).getDisplayName().compareTo(cache.get(o2).getDisplayName());
+ }
+
+ });
}
} finally {
ComponentContext.pop();
}
- User selection;
- if (getModelObject() != null)
- selection = getUserManager().findByName(getModelObject());
- else
- selection = null;
-
- if (selection != null && !choices.contains(selection))
- selection = null;
-
- List<Long> choiceIds = choices.stream().map(it->it.getId()).collect(Collectors.toList());
-
AtomicReference<Long> selectionId = new AtomicReference<>(null);
- if (selection != null)
- selectionId.set(selection.getId());
+
+ if (getModelObject() != null) {
+ UserFacade user = cache.findByName(getModelObject());
+ if (user != null && choiceIds.contains(user.getId()))
+ selectionId.set(user.getId());
+ }
input = new UserSingleChoice("input", new IModel<User>() {
@@ -94,11 +99,11 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {
selectionId.set(User.idOf(object));
}
- }, new LoadableDetachableModel<Collection<User>>() {
+ }, new LoadableDetachableModel<List<User>>() {
@Override
- protected Collection<User> load() {
- return choiceIds.stream().map(it-> getUserManager().load(it)).collect(Collectors.toList());
+ protected List<User> load() {
+ return choiceIds.stream().map(it -> getUserManager().load(it)).collect(Collectors.toList());
}
}) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java
index 7cc9219e19..5a44ccc092 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.java
@@ -2,7 +2,6 @@ package io.onedev.server.web.page.admin.group.membership;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -33,6 +32,8 @@ import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
+import com.google.common.collect.Sets;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.MembershipManager;
import io.onedev.server.entitymanager.UserManager;
@@ -41,8 +42,8 @@ import io.onedev.server.model.Membership;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.Similarities;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.EmailAddressVerificationStatusBadge;
@@ -78,10 +79,13 @@ public class GroupMembershipsPage extends GroupPage {
private EntityCriteria<Membership> getCriteria() {
EntityCriteria<Membership> criteria = EntityCriteria.of(Membership.class);
- if (query != null)
- criteria.createCriteria("user").add(Restrictions.ilike("name", query, MatchMode.ANYWHERE));
- else
+ if (query != null) {
+ criteria.createCriteria("user").add(Restrictions.or(
+ Restrictions.ilike(User.PROP_NAME, query, MatchMode.ANYWHERE),
+ Restrictions.ilike(User.PROP_FULL_NAME, query, MatchMode.ANYWHERE)));
+ } else {
criteria.setCacheable(true);
+ }
criteria.add(Restrictions.eq("group", getGroup()));
return criteria;
}
@@ -110,21 +114,22 @@ public class GroupMembershipsPage extends GroupPage {
@Override
public void query(String term, int page, Response<User> response) {
- List<User> nonMembers = OneDev.getInstance(UserManager.class).query();
- nonMembers.removeAll(getGroup().getMembers());
- Collections.sort(nonMembers);
- Collections.reverse(nonMembers);
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.removeAll(getGroup().getMembers());
+ users.sort(cache.comparingDisplayName(Sets.newHashSet()));
- nonMembers = MatchScoreUtils.filterAndSort(nonMembers, new MatchScoreProvider<User>() {
+ users = new Similarities<User>(users) {
@Override
- public double getMatchScore(User object) {
- return object.getMatchScore(term);
+ public double getSimilarScore(User object) {
+ return cache.getSimilarScore(object, term);
}
- });
+ };
- new ResponseFiller<>(response).fill(nonMembers, page, WebConstants.PAGE_SIZE);
+ new ResponseFiller<>(response).fill(users, page, WebConstants.PAGE_SIZE);
}
}) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
index 50c3f78492..310522cdc0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
@@ -30,11 +30,15 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import com.google.common.collect.Sets;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.EmailAddress;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.Similarities;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
@@ -56,6 +60,26 @@ public class UserListPage extends AdministrationPage {
private static final String PARAM_PAGE = "page";
private static final String PARAM_QUERY = "query";
+
+ private final IModel<List<User>> usersModel = new LoadableDetachableModel<List<User>>() {
+
+ @Override
+ protected List<User> load() {
+ UserCache cache = getUserManager().cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(Sets.newHashSet()));
+ users = new Similarities<User>(users) {
+
+ @Override
+ protected double getSimilarScore(User item) {
+ return cache.getSimilarScore(item, query);
+ }
+
+ };
+ return users;
+ }
+
+ };
private TextField<String> searchField;
@@ -297,12 +321,16 @@ public class UserListPage extends AdministrationPage {
@Override
public Iterator<? extends User> iterator(long first, long count) {
- return getUserManager().query(query, (int)first, (int)count).iterator();
+ List<User> users = usersModel.getObject();
+ if (first + count > users.size())
+ return users.subList((int)first, users.size()).iterator();
+ else
+ return users.subList((int)first, (int) (first+count)).iterator();
}
@Override
public long calcSize() {
- return OneDev.getInstance(UserManager.class).count(query);
+ return usersModel.getObject().size();
}
@Override
@@ -312,7 +340,7 @@ public class UserListPage extends AdministrationPage {
@Override
protected User load() {
- return OneDev.getInstance(UserManager.class).load(id);
+ return getUserManager().load(id);
}
};
@@ -345,6 +373,12 @@ public class UserListPage extends AdministrationPage {
return OneDev.getInstance(UserManager.class);
}
+ @Override
+ protected void onDetach() {
+ usersModel.detach();
+ super.onDetach();
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.java
index 51c00ea66d..9ff24e296c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.java
@@ -39,8 +39,7 @@ import io.onedev.server.entitymanager.MembershipManager;
import io.onedev.server.model.Group;
import io.onedev.server.model.Membership;
import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.Similarities;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.datatable.DefaultDataTable;
@@ -115,14 +114,14 @@ public class UserMembershipsPage extends UserPage {
Collections.sort(notMembersOf);
Collections.reverse(notMembersOf);
- notMembersOf = MatchScoreUtils.filterAndSort(notMembersOf, new MatchScoreProvider<Group>() {
+ notMembersOf = new Similarities<Group>(notMembersOf) {
@Override
- public double getMatchScore(Group object) {
- return MatchScoreUtils.getMatchScore(object.getName(), term);
+ public double getSimilarScore(Group object) {
+ return Similarities.getSimilarScore(object.getName(), term);
}
- });
+ };
new ResponseFiller<>(response).fill(notMembersOf, page, WebConstants.PAGE_SIZE);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
index b939e1e089..4f3b37a70a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
@@ -29,8 +29,8 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ContentDetector;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.Similarities;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.component.markdown.AtWhoReferenceSupport;
import io.onedev.server.web.component.markdown.MarkdownEditor;
import io.onedev.server.web.component.markdown.UserMentionSupport;
@@ -76,22 +76,23 @@ class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
@Override
public List<User> findUsers(String query, int count) {
- List<User> mentionables = OneDev.getInstance(UserManager.class).queryAndSort(Sets.newHashSet());
- List<User> filtered = MatchScoreUtils.filterAndSort(mentionables, new MatchScoreProvider<User>() {
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(Sets.newHashSet()));
+
+ users = new Similarities<User>(users) {
@Override
- public double getMatchScore(User object) {
- return object.getMatchScore(query)
- * (mentionables.size() - mentionables.indexOf(object))
- / mentionables.size();
+ public double getSimilarScore(User object) {
+ return cache.getSimilarScore(object, query);
}
- });
+ };
- if (filtered.size() > count)
- return filtered.subList(0, count);
+ if (users.size() > count)
+ return users.subList(0, count);
else
- return filtered;
+ return users;
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
index 9d7d9feed0..ca345b53f3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
@@ -91,8 +91,7 @@ import io.onedev.server.search.code.CodeSearchManager;
import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.match.MatchScoreProvider;
-import io.onedev.server.util.match.MatchScoreUtils;
+import io.onedev.server.util.Similarities;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;
@@ -1160,19 +1159,17 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
protected void onTypingDone(AjaxRequestTarget target) {
String searchInput = StringUtils.trimToNull(searchField.getInput());
- MatchScoreProvider<Symbol> matchScoreProvider = new MatchScoreProvider<Symbol>() {
+ List<Symbol> similarSymbols = new Similarities<Symbol>(symbols) {
@Override
- public double getMatchScore(Symbol object) {
- return MatchScoreUtils.getMatchScore(object.getName(), searchInput);
+ protected double getSimilarScore(Symbol item) {
+ return Similarities.getSimilarScore(item.getName(), searchInput);
}
};
- List<Symbol> matchedSymbols = MatchScoreUtils.filterAndSort(symbols, matchScoreProvider);
-
List<Symbol> filteredSymbols = new ArrayList<>();
- for (Symbol matchSymbol: matchedSymbols) {
+ for (Symbol matchSymbol: similarSymbols) {
Symbol currentSymbol = matchSymbol;
while (currentSymbol != null) {
if (!filteredSymbols.contains(currentSymbol))
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 10e6f0928d..38f27673fc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -60,6 +60,7 @@ import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.entitymanager.CodeCommentReplyManager;
import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
import io.onedev.server.infomanager.CommitInfoManager;
@@ -187,6 +188,10 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
return OneDev.getInstance(PullRequestManager.class);
}
+ private UserManager getUserManager() {
+ return OneDev.getInstance(UserManager.class);
+ }
+
public NewPullRequestPage(PageParameters params) {
super(params);
@@ -267,14 +272,13 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
assignment.setUser(SecurityUtils.getUser());
request.getAssignments().add(assignment);
} else {
- List<User> codeWriters = new ArrayList<>(
- SecurityUtils.getAuthorizedUsers(target.getProject(), new WriteCode()));
+ List<User> users = new ArrayList<>(getUserManager().getAuthorizedUsers(target.getProject(), new WriteCode()));
OneDev.getInstance(CommitInfoManager.class).sortUsersByContribution(
- codeWriters, target.getProject(), update.getChangedFiles());
- if (!codeWriters.isEmpty()) {
+ users, target.getProject(), update.getChangedFiles());
+ if (!users.isEmpty()) {
PullRequestAssignment assignment = new PullRequestAssignment();
assignment.setRequest(request);
- assignment.setUser(codeWriters.iterator().next());
+ assignment.setUser(users.iterator().next());
request.getAssignments().add(assignment);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 187728e2ad..054c76f133 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -73,12 +73,15 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.PullRequestReview.Status;
import io.onedev.server.model.PullRequestWatch;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.security.permission.ProjectPermission;
+import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.web.WebSession;
@@ -885,6 +888,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
protected AbstractEntity getEntity() {
return getPullRequest();
}
+
+ @Override
+ protected boolean isAuthorized(User user) {
+ return user.asSubject().isPermitted(new ProjectPermission(getProject(), new ReadCode()));
+ }
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index 78ad87c686..0d605df9c9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -53,6 +53,7 @@ import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.markdown.AttachmentSupport;
@@ -293,7 +294,10 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
@Override
protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getPullRequest().getParticipants());
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(getPullRequest().getParticipants()));
+ return users;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
index e561fc643c..262a733581 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
+import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -21,6 +22,7 @@ import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.project.comment.CommentPanel;
@@ -94,8 +96,10 @@ class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
@Override
protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(
- PullRequestCommentedPanel.this.getComment().getRequest().getParticipants());
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(PullRequestCommentedPanel.this.getComment().getRequest().getParticipants()));
+ return users;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
index c5a2c765f4..6c466c2f86 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
+import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -16,6 +17,7 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.project.comment.CommentPanel;
@@ -57,7 +59,10 @@ class PullRequestOpenedPanel extends GenericPanel<PullRequest> {
@Override
protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getPullRequest().getParticipants());
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(getPullRequest().getParticipants()));
+ return users;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java
index d081afc8bf..0fcf72c2f2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;
+import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
@@ -15,6 +16,7 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.project.comment.CommentInput;
@@ -48,8 +50,10 @@ public abstract class CommentableOperationConfirmPanel extends OperationConfirmP
@Override
protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class)
- .queryAndSort(getLatestUpdate().getRequest().getParticipants());
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+ List<User> users = new ArrayList<>(cache.getUsers());
+ users.sort(cache.comparingDisplayName(getLatestUpdate().getRequest().getParticipants()));
+ return users;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/EmailAddressVerificationPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/EmailAddressVerificationPage.java
index e5243c6270..cbd2576ed7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/EmailAddressVerificationPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/EmailAddressVerificationPage.java
@@ -36,7 +36,7 @@ public class EmailAddressVerificationPage extends SimplePage {
EmailAddress emailAddress = emailAddressModel.getObject();
String verificationCode = params.get(PARAM_VERIFICATION_CODE).toString();
- if (verificationCode.equals(emailAddress.getVerficationCode())) {
+ if (verificationCode.equals(emailAddress.getVerificationCode())) {
emailAddress.setVerificationCode(null);
getEmailAddressManager().save(emailAddress);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index b5aa6ed6cf..c331d117bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -18,6 +18,7 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
+
add(new Link<Void>("test") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index d42443df84..e72f825ef6 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.util;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -42,12 +43,13 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.model.support.build.JobSecret;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessProject;
-import io.onedev.server.util.ProjectCollection;
+import io.onedev.server.util.facade.ProjectCache;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.facade.UserCache;
import io.onedev.server.util.interpolative.VariableInterpolator;
import io.onedev.server.util.match.PatternApplied;
import io.onedev.server.util.match.WildcardUtils;
@@ -60,15 +62,31 @@ public class SuggestionUtils {
public static List<InputSuggestion> suggest(List<String> candidates, String matchWith) {
matchWith = matchWith.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
+
for (String candidate: candidates) {
LinearRange match = LinearRange.match(candidate, matchWith);
- if (match != null) {
+ if (match != null)
suggestions.add(new InputSuggestion(candidate, null, match));
- if (suggestions.size() >= InputAssistBehavior.MAX_SUGGESTIONS)
- break;
- }
}
- return suggestions;
+
+ return sortAndTruncate(suggestions, matchWith);
+ }
+
+ private static List<InputSuggestion> sortAndTruncate(List<InputSuggestion> suggestions, String matchWith) {
+ if (matchWith.length() != 0) {
+ suggestions.sort(new Comparator<InputSuggestion>() {
+
+ @Override
+ public int compare(InputSuggestion o1, InputSuggestion o2) {
+ return o1.getContent().length() - o2.getContent().length();
+ }
+
+ });
+ }
+ if (suggestions.size() > InputAssistBehavior.MAX_SUGGESTIONS)
+ return suggestions.subList(0, InputAssistBehavior.MAX_SUGGESTIONS);
+ else
+ return suggestions;
}
public static List<InputSuggestion> suggest(Map<String, String> candidates, String matchWith) {
@@ -76,13 +94,10 @@ public class SuggestionUtils {
List<InputSuggestion> suggestions = new ArrayList<>();
for (Map.Entry<String, String> entry: candidates.entrySet()) {
LinearRange match = LinearRange.match(entry.getKey(), matchWith);
- if (match != null) {
+ if (match != null)
suggestions.add(new InputSuggestion(entry.getKey(), entry.getValue(), match));
- if (suggestions.size() >= InputAssistBehavior.MAX_SUGGESTIONS)
- break;
- }
}
- return suggestions;
+ return sortAndTruncate(suggestions, matchWith);
}
public static List<InputSuggestion> suggestBranches(@Nullable Project project, String matchWith) {
@@ -139,24 +154,30 @@ public class SuggestionUtils {
}, ":");
}
+ private static ProjectManager getProjectManager() {
+ return OneDev.getInstance(ProjectManager.class);
+ }
+
public static List<InputSuggestion> suggestProjectPaths(String matchWith) {
- ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
- ProjectCollection projects = projectManager.getPermittedProjects(new AccessProject());
- List<String> projectPaths = new ArrayList<>();
- for (Long projectId: projects.getIds())
- projectPaths.add(projects.getCache().getPath(projectId));
- Collections.sort(projectPaths);
+ Collection<Project> projects = getProjectManager().getPermittedProjects(new AccessProject());
+ ProjectCache cache = getProjectManager().cloneCache();
+
+ List<String> projectPaths = projects.stream()
+ .map(it->cache.getPath(it.getId()))
+ .sorted()
+ .collect(Collectors.toList());
return suggest(projectPaths, matchWith);
}
public static List<InputSuggestion> suggestProjectNames(String matchWith) {
- ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
- ProjectCollection projects = projectManager.getPermittedProjects(new AccessProject());
- List<String> projectPaths = new ArrayList<>();
- for (Long projectId: projects.getIds())
- projectPaths.add(projects.getCache().get(projectId).getName());
- Collections.sort(projectPaths);
- return suggest(projectPaths, matchWith);
+ Collection<Project> projects = getProjectManager().getPermittedProjects(new AccessProject());
+ ProjectCache cache = getProjectManager().cloneCache();
+
+ List<String> projectNames = projects.stream()
+ .map(it->cache.get(it.getId()).getName())
+ .sorted()
+ .collect(Collectors.toList());
+ return suggest(projectNames, matchWith);
}
public static List<InputSuggestion> suggestAgents(String matchWith) {
@@ -172,7 +193,6 @@ public class SuggestionUtils {
@Nullable List<ParamSpec> paramSpecs, String matchWith, boolean withBuildVersion,
boolean withDynamicVariables) {
String lowerCaseMatchWith = matchWith.toLowerCase();
- int numSuggestions = 0;
List<InputSuggestion> suggestions = new ArrayList<>();
Map<String, String> variables = new LinkedHashMap<>();
@@ -215,28 +235,41 @@ public class SuggestionUtils {
for (Map.Entry<String, String> entry: variables.entrySet()) {
int index = entry.getKey().toLowerCase().indexOf(lowerCaseMatchWith);
- if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {
+ if (index != -1) {
suggestions.add(new InputSuggestion(entry.getKey(), entry.getValue(),
new LinearRange(index, index+lowerCaseMatchWith.length())));
}
}
- return suggestions;
+
+ return sortAndTruncate(suggestions, matchWith);
}
public static List<InputSuggestion> suggestUsers(String matchWith) {
- matchWith = matchWith.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
- for (User user: OneDev.getInstance(UserManager.class).query(matchWith, 0, InputAssistBehavior.MAX_SUGGESTIONS)) {
+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();
+ List<UserFacade> users = new ArrayList<>(cache.values());
+ users.sort(new Comparator<UserFacade>() {
+
+ @Override
+ public int compare(UserFacade o1, UserFacade o2) {
+ return o1.getName().compareTo(o2.getName());
+ }
+
+ });
+ for (UserFacade user: users) {
LinearRange match = LinearRange.match(user.getName(), matchWith);
- String description;
- if (!user.getDisplayName().equals(user.getName()))
- description = user.getDisplayName();
- else
- description = null;
- suggestions.add(new InputSuggestion(user.getName(), description, match));
+ if (match != null) {
+ String description;
+ if (!user.getDisplayName().equals(user.getName()))
+ description = user.getDisplayName();
+ else
+ description = null;
+ suggestions.add(new InputSuggestion(user.getName(), description, match));
+ }
}
- return suggestions;
+
+ return sortAndTruncate(suggestions, matchWith);
}
public static List<InputSuggestion> suggestLinkSpecs(String matchWith) {
@@ -319,17 +352,16 @@ public class SuggestionUtils {
public static List<InputSuggestion> suggestBlobs(Project project, String matchWith) {
CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
- return suggestPaths(commitInfoManager.getFiles(project), matchWith);
+ return suggestByPattern(commitInfoManager.getFiles(project), matchWith);
}
private static List<InputSuggestion> suggest(@Nullable Project project, String matchWith,
ProjectScopedSuggester projectScopedSuggester, String scopeSeparator) {
if (project == null) {
- ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
if (matchWith.contains(scopeSeparator)) {
String projectName = StringUtils.substringBefore(matchWith, scopeSeparator);
matchWith = StringUtils.substringAfter(matchWith, scopeSeparator);
- project = projectManager.findByPath(projectName);
+ project = getProjectManager().findByPath(projectName);
if (project != null) {
List<InputSuggestion> projectScopedSuggestions = projectScopedSuggester.suggest(project, matchWith);
if (projectScopedSuggestions != null) {
@@ -365,9 +397,13 @@ public class SuggestionUtils {
}
} else {
List<InputSuggestion> suggestions = new ArrayList<>();
- ProjectCollection projects = projectManager.getPermittedProjects(new AccessProject());
- for (Long projectId: projects.getIds()) {
- String projectPath = projects.getCache().getPath(projectId);
+ ProjectCache cache = getProjectManager().cloneCache();
+ List<String> projectPaths = getProjectManager().getPermittedProjects(new AccessProject()).stream()
+ .map(it->cache.getPath(it.getId()))
+ .collect(Collectors.toList());
+ Collections.sort(projectPaths);
+
+ for (String projectPath: projectPaths) {
LinearRange match = LinearRange.match(projectPath + scopeSeparator, matchWith);
if (match != null) {
suggestions.add(new InputSuggestion(
@@ -375,11 +411,9 @@ public class SuggestionUtils {
projectPath.length() + scopeSeparator.length(),
"select project first",
match));
- if (suggestions.size() >= InputAssistBehavior.MAX_SUGGESTIONS)
- break;
}
}
- return suggestions;
+ return sortAndTruncate(suggestions, matchWith);
}
} else {
return projectScopedSuggester.suggest(project, matchWith);
@@ -416,7 +450,8 @@ public class SuggestionUtils {
LinearRange match = LinearRange.match(buildVersion, matchWith);
suggestions.add(new InputSuggestion(buildVersion, null, match));
}
- return suggestions;
+
+ return sortAndTruncate(suggestions, matchWith);
}
public static List<InputSuggestion> suggestMilestones(Project project, String matchWith) {
@@ -443,13 +478,13 @@ public class SuggestionUtils {
return children;
}
- public static List<InputSuggestion> suggestPaths(List<String> paths, String matchWith) {
- matchWith = matchWith.toLowerCase();
+ public static List<InputSuggestion> suggestByPattern(List<String> paths, String pattern) {
+ pattern = pattern.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
List<PatternApplied> allApplied = new ArrayList<>();
for (String path: paths) {
- PatternApplied applied = WildcardUtils.applyPathPattern(matchWith, path, false);
+ PatternApplied applied = WildcardUtils.applyPathPattern(pattern, path, false);
if (applied != null)
allApplied.add(applied);
}
diff --git a/server-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java b/server-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java
new file mode 100644
index 0000000000..6ac2887776
--- /dev/null
+++ b/server-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java
@@ -0,0 +1,119 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.proxy.pojo;
+
+import java.io.Serializable;
+import java.lang.reflect.Method;
+
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.internal.util.MarkerObject;
+import org.hibernate.proxy.AbstractLazyInitializer;
+import org.hibernate.type.CompositeType;
+
+import io.onedev.server.model.AbstractEntity;
+
+/**
+ * Lazy initializer for POJOs
+ *
+ * @author Gavin King
+ */
+@SuppressWarnings("rawtypes")
+public abstract class BasicLazyInitializer extends AbstractLazyInitializer {
+
+ protected static final Object INVOKE_IMPLEMENTATION = new MarkerObject( "INVOKE_IMPLEMENTATION" );
+
+ protected final Class persistentClass;
+ protected final Method getIdentifierMethod;
+ protected final Method setIdentifierMethod;
+ protected final boolean overridesEquals;
+ protected final CompositeType componentIdType;
+
+ private Object replacement;
+
+ protected BasicLazyInitializer(
+ String entityName,
+ Class persistentClass,
+ Serializable id,
+ Method getIdentifierMethod,
+ Method setIdentifierMethod,
+ CompositeType componentIdType,
+ SharedSessionContractImplementor session,
+ boolean overridesEquals) {
+ super( entityName, id, session );
+ this.persistentClass = persistentClass;
+ this.getIdentifierMethod = getIdentifierMethod;
+ this.setIdentifierMethod = setIdentifierMethod;
+ this.componentIdType = componentIdType;
+ this.overridesEquals = overridesEquals;
+ }
+
+ protected abstract Object serializableProxy();
+
+ protected final Object invoke(Method method, Object[] args, Object proxy) throws Throwable {
+ String methodName = method.getName();
+ int params = args.length;
+
+ if ( params == 0 ) {
+ if ( "writeReplace".equals( methodName ) ) {
+ return getReplacement();
+ }
+ else if ("hashCode".equals( methodName ) ) {
+ return AbstractEntity.hashCode((AbstractEntity) proxy);
+ }
+ else if ( isUninitialized() && method.equals( getIdentifierMethod ) ) {
+ return getIdentifier();
+ }
+ else if ( "getHibernateLazyInitializer".equals( methodName ) ) {
+ return this;
+ }
+ }
+ else if ( params == 1 ) {
+ if ("equals".equals( methodName ) ) {
+ return AbstractEntity.equals(proxy, args[0]);
+ }
+ else if ( method.equals( setIdentifierMethod ) ) {
+ initialize();
+ setIdentifier( (Serializable) args[0] );
+ return INVOKE_IMPLEMENTATION;
+ }
+ }
+
+ //if it is a property of an embedded component, invoke on the "identifier"
+ if ( componentIdType != null && componentIdType.isMethodOf( method ) ) {
+ return method.invoke( getIdentifier(), args );
+ }
+
+ // otherwise:
+ return INVOKE_IMPLEMENTATION;
+
+ }
+
+ private Object getReplacement() {
+ /*
+ * If the target has already been loaded somewhere, just not set on the proxy,
+ * then use it to initialize the proxy so that we will serialize that instead of the proxy.
+ */
+ initializeWithoutLoadIfPossible();
+
+ if ( isUninitialized() ) {
+ if ( replacement == null ) {
+ prepareForPossibleLoadingOutsideTransaction();
+ replacement = serializableProxy();
+ }
+ return replacement;
+ }
+ else {
+ return getTarget();
+ }
+
+ }
+
+ public final Class getPersistentClass() {
+ return persistentClass;
+ }
+
+}
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
index 0563ebb9cb..418ef270df 100644
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
@@ -120,7 +120,7 @@ public class ProblemReportPage extends BuildReportPage {
@Override
protected List<InputSuggestion> suggest(String matchWith) {
- return SuggestionUtils.suggestPaths(filePaths, matchWith);
+ return SuggestionUtils.suggestByPattern(filePaths, matchWith);
}
@Override