The Unified and Autonomous Development Platform
chore: refactoring various search (code/issue/pull request etc)
Robin Shen213cf34b549f
diff --git a/pom.xml b/pom.xmlindex ac3b02fb07..3d07807e13 100644--- a/pom.xml+++ b/pom.xml@@ -95,6 +95,7 @@<modules><module>server-core</module><module>server-plugin</module>+ <module>server-ee</module><module>server-product</module></modules><dependencyManagement>diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 7a4a430493..444595956a 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -159,7 +159,9 @@ import java.io.Serializable;import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Field;import java.lang.reflect.Method;-import java.util.*;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;import java.util.concurrent.*;/**@@ -288,6 +290,9 @@ public class CoreModule extends AbstractPluginModule {bind(PullRequestLabelManager.class).to(DefaultPullRequestLabelManager.class);bind(ClusterManager.class).to(DefaultClusterManager.class);bind(StorageManager.class).to(DefaultStorageManager.class);+ bind(IssueTouchManager.class).to(DefaultIssueTouchManager.class);+ bind(PullRequestTouchManager.class).to(DefaultPullRequestTouchManager.class);+ bind(CodeCommentTouchManager.class).to(DefaultCodeCommentTouchManager.class);bind(WebHookManager.class);diff --git a/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.java b/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.javaindex 804404de08..15d62688c1 100644--- a/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.java+++ b/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.java@@ -9,6 +9,7 @@ import com.hazelcast.core.Hazelcast;import com.hazelcast.core.HazelcastInstance;import com.hazelcast.core.IExecutorService;import com.hazelcast.cp.IAtomicLong;+import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;@@ -23,6 +24,8 @@ import org.eclipse.jetty.server.session.SessionData;import javax.inject.Inject;import javax.inject.Singleton;+import java.io.ObjectStreamException;+import java.io.Serializable;import java.sql.ResultSet;import java.sql.SQLException;import java.sql.Statement;@@ -37,7 +40,7 @@ import static java.lang.String.format;import static java.util.stream.Collectors.toList;@Singleton-public class DefaultClusterManager implements ClusterManager {+public class DefaultClusterManager implements ClusterManager, Serializable {private static final String EXECUTOR_SERVICE_NAME = "default";@@ -289,8 +292,9 @@ public class DefaultClusterManager implements ClusterManager {@Overridepublic <T> Map<String, Future<T>> submitToAllServers(ClusterTask<T> task) {Map<String, Future<T>> futures = new HashMap<>();- for (var entry: getExecutorService().submitToAllMembers(task).entrySet())+ for (var entry: getExecutorService().submitToAllMembers(task).entrySet()) {futures.put(getServerAddress(entry.getKey()), entry.getValue());+ }return futures;}@@ -299,8 +303,9 @@ public class DefaultClusterManager implements ClusterManager {Map<String, Future<T>> futures = new HashMap<>();var servers = hazelcastInstance.getCluster().getMembers().stream().filter(it -> serverAddresses.contains(getServerAddress(it))).collect(toList());if (!servers.isEmpty()) {- for (var entry : getExecutorService().submitToMembers(task, servers).entrySet())+ for (var entry : getExecutorService().submitToMembers(task, servers).entrySet()) {futures.put(getServerAddress(entry.getKey()), entry.getValue());+ }}return futures;}@@ -388,5 +393,9 @@ public class DefaultClusterManager implements ClusterManager {public boolean isClusteringSupported() {return false;}++ public Object writeReplace() throws ObjectStreamException {+ return new ManagedSerializedForm(ClusterManager.class);+ }}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentTouchManager.javanew file mode 100644index 0000000000..8e1cd13c30--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentTouchManager.java@@ -0,0 +1,15 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.CodeCommentTouch;+import io.onedev.server.model.Project;+import io.onedev.server.persistence.dao.EntityManager;++import java.util.List;++public interface CodeCommentTouchManager extends EntityManager<CodeCommentTouch> {++ void touch(Project project, Long commentId);++ List<CodeCommentTouch> queryTouchesAfter(Long projectId, Long afterTouchId, int count);++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueTouchManager.javanew file mode 100644index 0000000000..afebd22b7f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueTouchManager.java@@ -0,0 +1,15 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.IssueTouch;+import io.onedev.server.model.Project;+import io.onedev.server.persistence.dao.EntityManager;++import java.util.List;++public interface IssueTouchManager extends EntityManager<IssueTouch> {++ void touch(Project project, Long issueId);++ List<IssueTouch> queryTouchesAfter(Long projectId, Long afterTouchId, int count);++}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.javaindex 675c6255c4..84f51cf6c8 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@@ -93,6 +93,8 @@ public interface ProjectManager extends EntityManager<Project> {Collection<Long> getActiveIds();+ Map<String, Collection<Long>> groupByActiveServers(Collection<Long> projectIds);+<T> T runOnActiveServer(Long projectId, ClusterTask<T> task);<T> Map<String, T> runOnReplicaServers(Long projectId, ClusterTask<T> task);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestTouchManager.javanew file mode 100644index 0000000000..9ad796e5cc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestTouchManager.java@@ -0,0 +1,15 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequestTouch;+import io.onedev.server.persistence.dao.EntityManager;++import java.util.List;++public interface PullRequestTouchManager extends EntityManager<PullRequestTouch> {++ void touch(Project project, Long requestId);++ List<PullRequestTouch> queryTouchesAfter(Long projectId, Long afterTouchId, int count);++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex 3d3260e844..4492175b5b 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -64,7 +64,8 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imprivate final CommitInfoManager commitInfoManager;@Inject- public DefaultCodeCommentManager(Dao dao, ListenerRegistry listenerRegistry, CommitInfoManager commitInfoManager) {+ public DefaultCodeCommentManager(Dao dao, ListenerRegistry listenerRegistry,+ CommitInfoManager commitInfoManager) {super(dao);this.listenerRegistry = listenerRegistry;this.commitInfoManager = commitInfoManager;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.javaindex 9b0a2fa97f..7b1460abcb 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java@@ -1,8 +1,5 @@package io.onedev.server.entitymanager.impl;-import javax.inject.Inject;-import javax.inject.Singleton;-import com.google.common.base.Preconditions;import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.event.ListenerRegistry;@@ -17,10 +14,13 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;+import javax.inject.Inject;+import javax.inject.Singleton;+@Singletonpublic class DefaultCodeCommentReplyManager extends BaseEntityManager<CodeCommentReply>implements CodeCommentReplyManager {-+private final ListenerRegistry listenerRegistry;@Injectdiff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentTouchManager.javanew file mode 100644index 0000000000..e7691a3cae--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentTouchManager.java@@ -0,0 +1,79 @@+package io.onedev.server.entitymanager.impl;++import io.onedev.server.entitymanager.CodeCommentTouchManager;+import io.onedev.server.event.Listen;+import io.onedev.server.event.entity.EntityPersisted;+import io.onedev.server.event.entity.EntityRemoved;+import io.onedev.server.model.*;+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.persistence.dao.EntityCriteria;+import org.hibernate.criterion.Restrictions;++import javax.inject.Inject;+import javax.inject.Singleton;++import java.util.List;++import static io.onedev.server.model.CodeCommentTouch.PROP_COMMENT_ID;+import static java.lang.String.format;++@Singleton+public class DefaultCodeCommentTouchManager extends BaseEntityManager<CodeCommentTouch>+ implements CodeCommentTouchManager {++ @Inject+ public DefaultCodeCommentTouchManager(Dao dao) {+ super(dao);+ }++ @Transactional+ @Override+ public void touch(Project project, Long commentId) {+ var query = getSession().createQuery(format("delete from CodeCommentTouch where project=:project and %s=:%s", PROP_COMMENT_ID, PROP_COMMENT_ID));+ query.setParameter("project", project);+ query.setParameter(PROP_COMMENT_ID, commentId);+ query.executeUpdate();++ var touch = new CodeCommentTouch();+ touch.setProject(project);+ touch.setCommentId(commentId);+ dao.persist(touch);+ }++ @Sessional+ @Override+ public List<CodeCommentTouch> queryTouchesAfter(Long projectId, Long afterTouchId, int count) {+ EntityCriteria<CodeCommentTouch> criteria = EntityCriteria.of(CodeCommentTouch.class);+ criteria.add(Restrictions.eq("project.id", projectId));+ criteria.add(Restrictions.gt(AbstractEntity.PROP_ID, afterTouchId));+ return dao.query(criteria, 0, count);+ }++ @Transactional+ @Listen+ public void on(EntityPersisted event) {+ if (event.getEntity() instanceof CodeComment) {+ CodeComment comment = (CodeComment) event.getEntity();+ touch(comment.getProject(), comment.getId());+ } else if (event.getEntity() instanceof CodeCommentReply) {+ CodeCommentReply reply = (CodeCommentReply) event.getEntity();+ touch(reply.getComment().getProject(), reply.getComment().getId());+ }+ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof CodeComment) {+ CodeComment comment = (CodeComment) event.getEntity();+ touch(comment.getProject(), comment.getId());+ } else if (event.getEntity() instanceof CodeCommentReply) {+ CodeCommentReply reply = (CodeCommentReply) event.getEntity();+ touch(reply.getComment().getProject(), reply.getComment().getId());+ }+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex c09abcba17..9a4a9fff8c 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@@ -92,6 +92,8 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Issprivate final ClusterManager clusterManager;+ private final IssueTouchManager touchManager;+private final SequenceGenerator numberGenerator;private volatile IMap<String, Long> ids;@@ -102,7 +104,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssSettingManager settingManager, ListenerRegistry listenerRegistry,ProjectManager projectManager, UserManager userManager, ClusterManager clusterManager,RoleManager roleManager, LinkSpecManager linkSpecManager, IssueLinkManager linkManager,- IssueAuthorizationManager authorizationManager) {+ IssueAuthorizationManager authorizationManager, IssueTouchManager touchManager) {super(dao);this.fieldManager = fieldManager;this.queryPersonalizationManager = queryPersonalizationManager;@@ -116,6 +118,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Issthis.linkManager = linkManager;this.authorizationManager = authorizationManager;this.clusterManager = clusterManager;+ this.touchManager = touchManager;numberGenerator = new SequenceGenerator(Issue.class, clusterManager, dao);}@@ -1063,6 +1066,9 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss}dao.persist(issue);}++ for (var issue: issues)+ touchManager.touch(sourceProject, issue.getId());listenerRegistry.post(new IssuesMoved(sourceProject, targetProject, issues));}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueTouchManager.javanew file mode 100644index 0000000000..2ae67ae491--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueTouchManager.java@@ -0,0 +1,85 @@+package io.onedev.server.entitymanager.impl;++import io.onedev.server.entitymanager.IssueTouchManager;+import io.onedev.server.event.Listen;+import io.onedev.server.event.entity.EntityPersisted;+import io.onedev.server.event.entity.EntityRemoved;+import io.onedev.server.model.*;+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.persistence.dao.EntityCriteria;+import org.hibernate.criterion.Restrictions;++import javax.inject.Inject;+import javax.inject.Singleton;++import java.util.List;++import static io.onedev.server.model.IssueTouch.PROP_ISSUE_ID;+import static java.lang.String.format;++@Singleton+public class DefaultIssueTouchManager extends BaseEntityManager<IssueTouch>+ implements IssueTouchManager {++ @Inject+ public DefaultIssueTouchManager(Dao dao) {+ super(dao);+ }++ @Transactional+ @Override+ public void touch(Project project, Long issueId) {+ var query = getSession().createQuery(format("delete from IssueTouch where project=:project and %s=:%s", PROP_ISSUE_ID, PROP_ISSUE_ID));+ query.setParameter("project", project);+ query.setParameter(PROP_ISSUE_ID, issueId);+ query.executeUpdate();++ var touch = new IssueTouch();+ touch.setProject(project);+ touch.setIssueId(issueId);+ dao.persist(touch);+ }++ @Sessional+ @Override+ public List<IssueTouch> queryTouchesAfter(Long projectId, Long afterTouchId, int count) {+ EntityCriteria<IssueTouch> criteria = EntityCriteria.of(IssueTouch.class);+ criteria.add(Restrictions.eq("project.id", projectId));+ criteria.add(Restrictions.gt(AbstractEntity.PROP_ID, afterTouchId));+ return dao.query(criteria, 0, count);+ }++ @Transactional+ @Listen+ public void on(EntityPersisted event) {+ if (event.getEntity() instanceof Issue) {+ Issue issue = (Issue) event.getEntity();+ touch(issue.getProject(), issue.getId());+ } else if (event.getEntity() instanceof IssueComment) {+ IssueComment comment = (IssueComment) event.getEntity();+ touch(comment.getIssue().getProject(), comment.getIssue().getId());+ } else if (event.getEntity() instanceof IssueField) {+ IssueField field = (IssueField) event.getEntity();+ touch(field.getIssue().getProject(), field.getIssue().getId());+ }+ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Issue) {+ Issue issue = (Issue) event.getEntity();+ touch(issue.getProject(), issue.getId());+ } else if (event.getEntity() instanceof IssueComment) {+ IssueComment comment = (IssueComment) event.getEntity();+ touch(comment.getIssue().getProject(), comment.getIssue().getId());+ } else if (event.getEntity() instanceof IssueField) {+ IssueField field = (IssueField) event.getEntity();+ touch(field.getIssue().getProject(), field.getIssue().getId());+ }+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 75871a6e38..f88900f399 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@@ -1134,6 +1134,19 @@ public class DefaultProjectManager extends BaseEntityManager<Project>return activeServers.project(Map.Entry::getKey, entry -> entry.getValue().equals(localServer));}+ @Override+ public Map<String, Collection<Long>> groupByActiveServers(Collection<Long> projectIds) {+ Map<String, Collection<Long>> projectIdsByServer = new HashMap<>();+ for (var projectId: projectIds) {+ var activeServer = activeServers.get(projectId);+ if (activeServer != null) {+ var projectIdsOnServer = projectIdsByServer.computeIfAbsent(activeServer, k -> new HashSet<>());+ projectIdsOnServer.add(projectId);+ }+ }+ return projectIdsByServer;+ }+private String updateActiveServer(Long projectId,Map<String, ProjectReplica> replicasOfProject,boolean syncReplicas) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestTouchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestTouchManager.javanew file mode 100644index 0000000000..15fd6d320d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestTouchManager.java@@ -0,0 +1,85 @@+package io.onedev.server.entitymanager.impl;++import io.onedev.server.entitymanager.PullRequestTouchManager;+import io.onedev.server.event.Listen;+import io.onedev.server.event.entity.EntityPersisted;+import io.onedev.server.event.entity.EntityRemoved;+import io.onedev.server.model.*;+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.persistence.dao.EntityCriteria;+import org.hibernate.criterion.Restrictions;++import javax.inject.Inject;+import javax.inject.Singleton;++import java.util.List;++import static io.onedev.server.model.PullRequestTouch.PROP_REQUEST_ID;+import static java.lang.String.format;++@Singleton+public class DefaultPullRequestTouchManager extends BaseEntityManager<PullRequestTouch>+ implements PullRequestTouchManager {++ @Inject+ public DefaultPullRequestTouchManager(Dao dao) {+ super(dao);+ }++ @Transactional+ @Override+ public void touch(Project project, Long requestId) {+ var query = getSession().createQuery(format("delete from PullRequestTouch where project=:project and %s=:%s", PROP_REQUEST_ID, PROP_REQUEST_ID));+ query.setParameter("project", project);+ query.setParameter(PROP_REQUEST_ID, requestId);+ query.executeUpdate();++ var touch = new PullRequestTouch();+ touch.setProject(project);+ touch.setRequestId(requestId);+ dao.persist(touch);+ }++ @Sessional+ @Override+ public List<PullRequestTouch> queryTouchesAfter(Long projectId, Long afterTouchId, int count) {+ EntityCriteria<PullRequestTouch> criteria = EntityCriteria.of(PullRequestTouch.class);+ criteria.add(Restrictions.eq("project.id", projectId));+ criteria.add(Restrictions.gt(AbstractEntity.PROP_ID, afterTouchId));+ return dao.query(criteria, 0, count);+ }++ @Transactional+ @Listen+ public void on(EntityPersisted event) {+ if (event.getEntity() instanceof PullRequest) {+ PullRequest request = (PullRequest) event.getEntity();+ touch(request.getProject(), request.getId());+ } else if (event.getEntity() instanceof PullRequestComment) {+ PullRequestComment comment = (PullRequestComment) event.getEntity();+ touch(comment.getRequest().getProject(), comment.getRequest().getId());+ } else if (event.getEntity() instanceof PullRequestUpdate) {+ PullRequestUpdate update = (PullRequestUpdate) event.getEntity();+ touch(update.getRequest().getProject(), update.getRequest().getId());+ }+ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof PullRequest) {+ PullRequest request = (PullRequest) event.getEntity();+ touch(request.getProject(), request.getId());+ } else if (event.getEntity() instanceof PullRequestComment) {+ PullRequestComment comment = (PullRequestComment) event.getEntity();+ touch(comment.getRequest().getProject(), comment.getRequest().getId());+ } else if (event.getEntity() instanceof PullRequestUpdate) {+ PullRequestUpdate update = (PullRequestUpdate) event.getEntity();+ touch(update.getRequest().getProject(), update.getRequest().getId());+ }+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.javaindex 8d2495c2ac..83b83f7247 100644--- a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java@@ -45,18 +45,19 @@ public class ReferenceParser {if (fastScan(text)) {Matcher matcher = pattern.matcher(text);while (matcher.find()) {- String referenceProjectName = matcher.group(4);- Long referenceNumber = Long.valueOf(matcher.group(6));-- Project referenceProject;- if (referenceProjectName != null) {- referenceProject = projectManager.findByPath(referenceProjectName);- } else {- referenceProject = project;+ try {+ String referenceProjectName = matcher.group(4);+ Long referenceNumber = Long.valueOf(matcher.group(6));+ Project referenceProject;+ if (referenceProjectName != null) {+ referenceProject = projectManager.findByPath(referenceProjectName);+ } else {+ referenceProject = project;+ }+ if (referenceProject != null)+ references.add(new ProjectScopedNumber(referenceProject, referenceNumber));+ } catch (NumberFormatException ignored) {}-- if (referenceProject != null)- references.add(new ProjectScopedNumber(referenceProject, referenceNumber));}}return new ArrayList<>(references);diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.javaindex 017c837e21..d2d27b39f3 100644--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java@@ -118,7 +118,7 @@ public class GitFilter implements Filter {}protected void processPack(final HttpServletRequest request, final HttpServletResponse response)- throws ServletException, IOException, InterruptedException, ExecutionException {+ throws IOException, InterruptedException, ExecutionException {Long userId = SecurityUtils.getUserId();boolean clusterAccess = userId.equals(User.SYSTEM_ID);@@ -139,14 +139,14 @@ public class GitFilter implements Filter {InputStream stdin = new InputStreamWrapper(ServletUtils.getInputStream(request)) {@Override- public void close() throws IOException {+ public void close() {}};OutputStream stdout = new OutputStreamWrapper(response.getOutputStream()) {@Override- public void close() throws IOException {+ public void close() {}};diff --git a/server-core/src/main/java/io/onedev/server/infomanager/AbstractMultiEnvironmentManager.java b/server-core/src/main/java/io/onedev/server/infomanager/AbstractMultiEnvironmentManager.javaindex c4d7e06b1d..6768912366 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/AbstractMultiEnvironmentManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/AbstractMultiEnvironmentManager.java@@ -6,6 +6,7 @@ import java.util.concurrent.ConcurrentHashMap;import io.onedev.commons.utils.FileUtils;import io.onedev.server.event.Listen;+import io.onedev.server.event.system.SystemStopped;import io.onedev.server.event.system.SystemStopping;import jetbrains.exodus.backup.BackupStrategy;import jetbrains.exodus.backup.VirtualFileDescriptor;@@ -38,7 +39,7 @@ public abstract class AbstractMultiEnvironmentManager extends AbstractEnvironmen}@Listen- public void on(SystemStopping event) {+ public void on(SystemStopped event) {synchronized (envs) {for (Environment env: envs.values())env.close();diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.javaindex 6403434e3a..45201525b0 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.java@@ -224,7 +224,7 @@ public class DefaultIssueInfoManager extends AbstractMultiEnvironmentManagerprivate static final long serialVersionUID = 1L;@Override- public Void call() throws Exception {+ public Void call() {try {event.getIssueIds().forEach(it -> remove(sourceProjectId, it));} catch (Exception e) {diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex e308511bd5..b9bc35197d 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -5328,4 +5328,7 @@ public class DataMigrator {}}+ private void migrate122(File dataDir, Stack<Integer> versions) {+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentTouch.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentTouch.javanew file mode 100644index 0000000000..6a353fd3f9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentTouch.java@@ -0,0 +1,55 @@+package io.onedev.server.model;++import io.onedev.server.model.support.EntityTouch;++import javax.persistence.*;++import static io.onedev.server.model.CodeCommentTouch.*;++@Entity+@Table(+ indexes={+ @Index(columnList="o_project_id"),+ @Index(columnList= PROP_COMMENT_ID)})+public class CodeCommentTouch extends EntityTouch {++ private static final long serialVersionUID = 1L;++ public static final String PROP_COMMENT_ID = "commentId";++ @ManyToOne(fetch=FetchType.LAZY)+ private Project project;++ private Long commentId;++ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }++ public Long getCommentId() {+ return commentId;+ }++ public void setCommentId(Long commentId) {+ this.commentId = commentId;+ }++ @Override+ public Class<? extends AbstractEntity> getEntityClass() {+ return CodeComment.class;+ }++ @Override+ public Long getProjectId() {+ return getProject().getId();+ }++ @Override+ public Long getEntityId() {+ return getCommentId();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/IssueTouch.java b/server-core/src/main/java/io/onedev/server/model/IssueTouch.javanew file mode 100644index 0000000000..265aa8d8ec--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/IssueTouch.java@@ -0,0 +1,56 @@+package io.onedev.server.model;++import io.onedev.server.model.support.EntityTouch;++import javax.persistence.*;++import static io.onedev.server.model.IssueTouch.*;++@Entity+@Table(+ indexes={+ @Index(columnList="o_project_id"),+ @Index(columnList= PROP_ISSUE_ID)})+public class IssueTouch extends EntityTouch {++ private static final long serialVersionUID = 1L;++ public static final String PROP_ISSUE_ID = "issueId";++ @ManyToOne(fetch=FetchType.LAZY)+ private Project project;++ private Long issueId;++ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }++ public Long getIssueId() {+ return issueId;+ }++ public void setIssueId(Long issueId) {+ this.issueId = issueId;+ }++ @Override+ public Class<? extends AbstractEntity> getEntityClass() {+ return Issue.class;+ }++ @Override+ public Long getProjectId() {+ return getProject().getId();+ }++ @Override+ public Long getEntityId() {+ return getIssueId();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex e59655b6b2..b2f1a8d172 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -229,9 +229,15 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel@OneToMany(mappedBy="sourceProject")private Collection<PullRequest> outgoingRequests = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<PullRequestTouch> requestTouches = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<Issue> issues = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<IssueTouch> issueTouches = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@@ -261,6 +267,9 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<CodeComment> codeComments = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<CodeCommentTouch> codeCommentTouches = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<IssueQueryPersonalization> issueQueryPersonalizations = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestTouch.java b/server-core/src/main/java/io/onedev/server/model/PullRequestTouch.javanew file mode 100644index 0000000000..e81b5e74ba--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestTouch.java@@ -0,0 +1,56 @@+package io.onedev.server.model;++import io.onedev.server.model.support.EntityTouch;++import javax.persistence.*;++import static io.onedev.server.model.PullRequestTouch.*;++@Entity+@Table(+ indexes={+ @Index(columnList="o_project_id"),+ @Index(columnList= PROP_REQUEST_ID)})+public class PullRequestTouch extends EntityTouch {++ private static final long serialVersionUID = 1L;++ public static final String PROP_REQUEST_ID = "requestId";++ @ManyToOne(fetch=FetchType.LAZY)+ private Project project;++ private Long requestId;++ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }++ public Long getRequestId() {+ return requestId;+ }++ public void setRequestId(Long requestId) {+ this.requestId = requestId;+ }++ @Override+ public Class<? extends AbstractEntity> getEntityClass() {+ return PullRequest.class;+ }++ @Override+ public Long getProjectId() {+ return getProject().getId();+ }++ @Override+ public Long getEntityId() {+ return getRequestId();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/EntityTouch.java b/server-core/src/main/java/io/onedev/server/model/support/EntityTouch.javanew file mode 100644index 0000000000..97f38b437a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/EntityTouch.java@@ -0,0 +1,18 @@+package io.onedev.server.model.support;++import io.onedev.server.model.AbstractEntity;++import javax.persistence.MappedSuperclass;++@MappedSuperclass+public abstract class EntityTouch extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public abstract Class<? extends AbstractEntity> getEntityClass();++ public abstract Long getProjectId();++ public abstract Long getEntityId();++}diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/Dao.java b/server-core/src/main/java/io/onedev/server/persistence/dao/Dao.javaindex 020402b0b9..e8861d65fe 100644--- a/server-core/src/main/java/io/onedev/server/persistence/dao/Dao.java+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/Dao.java@@ -77,8 +77,6 @@ public interface Dao {<T extends AbstractEntity> List<T> query(Class<T> entityClass);<T extends AbstractEntity> List<T> query(Class<T> entityClass, boolean cacheable);-- <T extends AbstractEntity> List<T> queryAfter(Class<T> entityClass, Long afterEntityId, int count);<T extends AbstractEntity> int count(Class<T> entityClass);@@ -99,7 +97,7 @@ public interface Dao {* number of entities matching specified {@link DetachedCriteria}*/<T extends AbstractEntity> int count(EntityCriteria<T> entityCriteria);-+SessionManager getSessionManager();Session getSession();diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java b/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.javaindex 1fe58a651b..73e655e622 100644--- a/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java@@ -10,9 +10,7 @@ import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import org.hibernate.Criteria;import org.hibernate.Session;-import org.hibernate.criterion.Order;import org.hibernate.criterion.Projections;-import org.hibernate.criterion.Restrictions;import javax.inject.Inject;import javax.inject.Singleton;@@ -134,14 +132,5 @@ public class DefaultDao implements Dao, Serializable {public Session getSession() {return sessionManager.getSession();}-- @Sessional- @Override- public <T extends AbstractEntity> List<T> queryAfter(Class<T> entityClass, Long afterEntityId, int count) {- EntityCriteria<T> criteria = EntityCriteria.of(entityClass);- criteria.add(Restrictions.gt(AbstractEntity.PROP_ID, afterEntityId));- criteria.addOrder(Order.asc(AbstractEntity.PROP_ID));- return query(criteria, 0, count);- }}diff --git a/server-core/src/main/java/io/onedev/server/search/code/CodeSearchManager.java b/server-core/src/main/java/io/onedev/server/search/code/CodeSearchManager.javaindex ab0699fa8d..eb115df7ef 100644--- a/server-core/src/main/java/io/onedev/server/search/code/CodeSearchManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/CodeSearchManager.java@@ -25,7 +25,7 @@ public interface CodeSearchManager {* InterruptedException if the search process is interrupted*/List<QueryHit> search(Project project, ObjectId commitId, BlobQuery query)- throws InterruptedException, TooGeneralQueryException;+ throws TooGeneralQueryException;@NullableList<Symbol> getSymbols(Project project, ObjectId blobId, String blobPath);diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.javaindex dcc79107da..39f37b1de1 100644--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java@@ -1,6 +1,7 @@package io.onedev.server.search.code;import com.google.common.base.Preconditions;+import com.google.common.base.Splitter;import io.onedev.commons.jsymbol.Symbol;import io.onedev.commons.jsymbol.SymbolExtractor;import io.onedev.commons.jsymbol.SymbolExtractorRegistry;@@ -15,6 +16,7 @@ import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.project.CommitIndexed;import io.onedev.server.event.project.RefUpdated;import io.onedev.server.event.system.SystemStarted;+import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.annotation.Sessional;@@ -56,8 +58,7 @@ import java.util.List;import java.util.concurrent.atomic.AtomicReference;import static io.onedev.server.search.code.FieldConstants.*;-import static io.onedev.server.search.code.IndexConstants.MAX_INDEXABLE_SIZE;-import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;+import static io.onedev.server.search.code.IndexConstants.*;@Singletonpublic class DefaultCodeIndexManager implements CodeIndexManager, Serializable {@@ -68,7 +69,7 @@ public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {private static final int BACKEND_INDEXING_PRIORITY = 50;- private static final int DATA_VERSION = 6;+ private static final int DATA_VERSION = 7;private final BatchWorkManager batchWorkManager;@@ -226,18 +227,19 @@ public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {document.add(new StringField(BLOB_PATH.name(), blobPath, Store.NO));document.add(new BinaryDocValuesField(BLOB_PATH.name(), new BytesRef(blobPath.getBytes(StandardCharsets.UTF_8))));- String blobName = blobPath;- if (blobPath.indexOf('/') != -1)- blobName = StringUtils.substringAfterLast(blobPath, "/");+ String blobName = GitUtils.getBlobName(blobPath);document.add(new StringField(BLOB_NAME.name(), blobName.toLowerCase(), Store.NO));ObjectLoader objectLoader = repository.open(blobId);- if (objectLoader.getSize() <= MAX_INDEXABLE_SIZE) {+ if (objectLoader.getSize() <= MAX_INDEXABLE_BLOB_SIZE) {byte[] bytes = objectLoader.getCachedBytes();String content = ContentDetector.convertToText(bytes, blobName);if (content != null) {- document.add(new TextField(BLOB_TEXT.name(), content, Store.NO));+ for (var line: Splitter.on('\n').split(content)) {+ if (line.length() <= MAX_INDEXABLE_LINE_LEN)+ document.add(new TextField(BLOB_TEXT.name(), line, Store.NO));+ }if (extractor != null) {List<Symbol> symbols = null;@@ -298,10 +300,11 @@ public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {writerConfig.setOpenMode(OpenMode.CREATE_OR_APPEND);try (IndexWriter writer = new IndexWriter(directory, writerConfig)) {try {- logger.debug("Indexing commit (project: {}, commit: {})", project.getPath(), commit.getName());+ logger.debug("Indexing commit (project: {}, commit: {})...", project.getPath(), commit.getName());IndexResult indexResult = index(projectManager.getRepository(project.getId()),commit, writer, searcher, PatternSet.parse(project.findCodeAnalysisPatterns()));writer.commit();+ logger.debug("Commit indexed (project: {}, commit: {})", project.getPath(), commit.getName());return indexResult;} catch (Exception e) {writer.rollback();@@ -381,7 +384,7 @@ public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {batchWorkManager.submit(getBatchWorker(event.getProject().getId()), work);}}-+@Sessional@Listenpublic void on(SystemStarted event) {diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchManager.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchManager.javaindex 32f2edce7f..e5910875e4 100644--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeSearchManager.java@@ -104,8 +104,7 @@ public class DefaultCodeSearchManager implements CodeSearchManager, Serializable}@Override- public List<QueryHit> search(Project project, ObjectId commitId, final BlobQuery query)- throws InterruptedException {+ public List<QueryHit> search(Project project, ObjectId commitId, final BlobQuery query) {Long projectId = project.getId();return projectManager.runOnActiveServer(projectId, new ClusterTask<List<QueryHit>>() {@@ -140,7 +139,7 @@ public class DefaultCodeSearchManager implements CodeSearchManager, Serializable@Overridepublic void collect(int doc) throws IOException {- if (hits.size() < query.getCount() && !Thread.currentThread().isInterrupted()) {+ if (hits.size() < query.getCount()) {Preconditions.checkState(blobPathValues.advanceExact(doc));String blobPath = blobPathValues.binaryValue().utf8ToString();@@ -150,6 +149,8 @@ public class DefaultCodeSearchManager implements CodeSearchManager, Serializablequery.collect(searcher, treeWalk, hits);checkedBlobPaths.add(blobPath);}+ } else {+ throw new CollectionTerminatedException();}}diff --git a/server-core/src/main/java/io/onedev/server/search/code/IndexConstants.java b/server-core/src/main/java/io/onedev/server/search/code/IndexConstants.javaindex f661bb547e..87395ad751 100644--- a/server-core/src/main/java/io/onedev/server/search/code/IndexConstants.java+++ b/server-core/src/main/java/io/onedev/server/search/code/IndexConstants.java@@ -2,8 +2,10 @@ package io.onedev.server.search.code;public interface IndexConstants {- int MAX_INDEXABLE_SIZE = 1024*1024;-+ int MAX_INDEXABLE_BLOB_SIZE = 1024*1024;++ int MAX_INDEXABLE_LINE_LEN = 1024;+int NGRAM_SIZE = 3;}diff --git a/server-core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java b/server-core/src/main/java/io/onedev/server/search/code/hit/QueryHit.javaindex 8a3a471df0..b1724a1b11 100644--- a/server-core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java+++ b/server-core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java@@ -15,11 +15,11 @@ public abstract class QueryHit implements Serializable {private final String blobPath;- private final PlanarRange tokenPos;+ private final PlanarRange hitPos;- public QueryHit(String blobPath, @Nullable PlanarRange tokenPos) {+ public QueryHit(String blobPath, @Nullable PlanarRange hitPos) {this.blobPath = blobPath;- this.tokenPos = tokenPos;+ this.hitPos = hitPos;}public String getBlobPath() {@@ -27,8 +27,8 @@ public abstract class QueryHit implements Serializable {}@Nullable- public PlanarRange getTokenPos() {- return tokenPos;+ public PlanarRange getHitPos() {+ return hitPos;}public abstract Component render(String componentId);diff --git a/server-core/src/main/java/io/onedev/server/search/code/hit/TextHit.java b/server-core/src/main/java/io/onedev/server/search/code/hit/TextHit.javaindex 8ed6e03209..5d03dfa1f3 100644--- a/server-core/src/main/java/io/onedev/server/search/code/hit/TextHit.java+++ b/server-core/src/main/java/io/onedev/server/search/code/hit/TextHit.java@@ -27,9 +27,9 @@ public class TextHit extends QueryHit {@Overridepublic Component render(String componentId) {- if (getTokenPos() != null) {+ if (getHitPos() != null) {return new HighlightableLabel(componentId, line,- new LinearRange(getTokenPos().getFromColumn(), getTokenPos().getToColumn()));+ new LinearRange(getHitPos().getFromColumn(), getHitPos().getToColumn()));} else {return new HighlightableLabel(componentId, line, null);}diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.javaindex 5ab6262ffa..c7172e2ac7 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java@@ -1,6 +1,7 @@package io.onedev.server.search.code.query;import com.google.common.base.Preconditions;+import io.onedev.server.git.GitUtils;import io.onedev.server.search.code.hit.FileHit;import io.onedev.server.search.code.hit.QueryHit;import org.apache.lucene.search.BooleanQuery;@@ -32,7 +33,7 @@ public class FileQuery extends BlobQuery {@Overridepublic void collect(IndexSearcher searcher, TreeWalk treeWalk, List<QueryHit> hits) {String blobPath = treeWalk.getPathString();- String blobName = blobPath.substring(blobPath.lastIndexOf('/')+1);+ String blobName = GitUtils.getBlobName(blobPath);var match = getOption().matches(blobName, excludeFileName);if (match != null)hits.add(new FileHit(blobPath, match.orElse(null)));@@ -49,7 +50,7 @@ public class FileQuery extends BlobQuery {public static class Builder {- private String term;+ private final String term;private boolean caseSensitive;diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.javaindex 0f60cb79f9..f65f8797ac 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java@@ -45,7 +45,7 @@ public class FileQueryOption implements QueryOption {}public void applyConstraints(BooleanQuery.Builder builder) {- Preconditions.checkNotNull(term != null);+ Preconditions.checkNotNull(term);boolean tooGeneral = true;for (char ch: term.toCharArray()) {@@ -62,22 +62,22 @@ public class FileQueryOption implements QueryOption {@Nullablepublic Optional<LinearRange> matches(String blobName, @Nullable String excludeFileName) {- Preconditions.checkNotNull(term != null);+ Preconditions.checkNotNull(term);- if (caseSensitive) {- if (WildcardUtils.matchString(term, blobName)- && (excludeFileName == null || !excludeFileName.equals(blobName))) {- return ofNullable(rangeOfMatch(term, blobName));- } else {- return null;- }+ var normalizedTerm = term;+ var normalizedBlobName = blobName;+ var normalizedExcludeFileName = excludeFileName;+ if (!caseSensitive) {+ normalizedBlobName = normalizedBlobName.toLowerCase();+ normalizedTerm = normalizedTerm.toLowerCase();+ if (normalizedExcludeFileName != null)+ normalizedExcludeFileName = normalizedExcludeFileName.toLowerCase();+ }+ if (WildcardUtils.matchString(normalizedTerm, normalizedBlobName)+ && (normalizedExcludeFileName == null || !normalizedExcludeFileName.equals(normalizedBlobName))) {+ return ofNullable(rangeOfMatch(normalizedTerm, normalizedBlobName));} else {- if (WildcardUtils.matchString(term, blobName.toLowerCase())- && (excludeFileName == null || !excludeFileName.equalsIgnoreCase(blobName))) {- return ofNullable(rangeOfMatch(term, blobName.toLowerCase()));- } else {- return null;- }+ return null;}}diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.javaindex 89abae85b7..783412c913 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java@@ -72,7 +72,7 @@ public class SymbolQuery extends BlobQuery {public static class Builder {- private String term;+ private final String term;private boolean caseSensitive;diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.javaindex befd7ef951..139391303b 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java@@ -59,7 +59,7 @@ public class SymbolQueryOption implements QueryOption {public List<Match> matches(String blobPath, List<Symbol> symbols, @Nullable String excludeTerm,@Nullable String excludeBlobPath, @Nullable Boolean primary,@Nullable Boolean local, int count) {- Preconditions.checkNotNull(term != null);+ Preconditions.checkNotNull(term);var matches = new ArrayList<Match>();for (Symbol symbol: symbols) {@@ -103,7 +103,8 @@ public class SymbolQueryOption implements QueryOption {}public void applyConstraints(BooleanQuery.Builder builder, @Nullable Boolean primary) {- Preconditions.checkNotNull(term != null);+ Preconditions.checkNotNull(term);+if (fileNames != null) {BooleanQuery.Builder subQueryBuilder = new BooleanQuery.Builder();for (String pattern: Splitter.on(",").omitEmptyStrings().trimResults().split(fileNames.toLowerCase()))diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.javaindex c30e2ac2c2..ebbe9ae7bf 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/TextQuery.java@@ -60,7 +60,7 @@ public class TextQuery extends BlobQuery {public static class Builder {- private String term;+ private final String term;private boolean regex;diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.javaindex 6467c8e5ff..1dab6a6f56 100644--- a/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java+++ b/server-core/src/main/java/io/onedev/server/search/code/query/TextQueryOption.java@@ -20,23 +20,19 @@ import org.eclipse.jgit.lib.ObjectLoader;import javax.annotation.Nullable;import java.io.Serializable;import java.util.ArrayList;-import java.util.Collections;import java.util.List;import java.util.regex.Matcher;import java.util.regex.Pattern;import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;import static io.onedev.server.search.code.FieldConstants.BLOB_TEXT;+import static io.onedev.server.search.code.IndexConstants.MAX_INDEXABLE_LINE_LEN;import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;public class TextQueryOption implements QueryOption {private static final long serialVersionUID = 1L;- private static final int MAX_LINE_LEN = 1024;-- private static final int CONTEXT_SIZE = 3;-private final String term;private final boolean regex;@@ -110,23 +106,22 @@ public class TextQueryOption implements QueryOption {}public List<Match> matches(String blobPath, ObjectLoader objectLoader, int count) {- Preconditions.checkNotNull(term != null);+ Preconditions.checkNotNull(term);var matches = new ArrayList<Match>();- if (objectLoader.getSize() <= IndexConstants.MAX_INDEXABLE_SIZE) {+ if (objectLoader.getSize() <= IndexConstants.MAX_INDEXABLE_BLOB_SIZE) {String content = ContentDetector.convertToText(objectLoader.getCachedBytes(), blobPath);if (content != null) {Pattern pattern = getPattern();if (pattern != null) {int lineNo = 0;- var lines = Splitter.on('\n').splitToList(content);- for (String line: lines) {- if (line.length() <= MAX_LINE_LEN) {+ for (String line: Splitter.on('\n').split(content)) {+ if (line.length() <= MAX_INDEXABLE_LINE_LEN) {Matcher matcher = pattern.matcher(line);while (matcher.find()) {LinearRange range = new LinearRange(matcher.start(), matcher.end());PlanarRange position = new PlanarRange(lineNo, range.getFrom(), lineNo, range.getTo());- matches.add(new Match(line, position, getPrefixLines(lines, lineNo), getSuffixLines(lines, lineNo)));+ matches.add(new Match(line, position));if (matches.size() >= count)break;}@@ -142,10 +137,9 @@ public class TextQueryOption implements QueryOption {elsenormalizedTerm = term;- var lines = Splitter.on('\n').splitToList(content);int lineNo = 0;- for (String line: lines) {- if (line.length() <= MAX_LINE_LEN) {+ for (String line: Splitter.on('\n').split(content)) {+ if (line.length() <= MAX_INDEXABLE_LINE_LEN) {String normalizedLine;if (!caseSensitive)normalizedLine = line.toLowerCase();@@ -171,14 +165,14 @@ public class TextQueryOption implements QueryOption {if (!isWordChar(beforeChar) && !isWordChar(afterChar)) {LinearRange range = new LinearRange(start, end);PlanarRange position = new PlanarRange(lineNo, range.getFrom(), lineNo, range.getTo());- matches.add(new Match(line, position, getPrefixLines(lines, lineNo), getSuffixLines(lines, lineNo)));+ matches.add(new Match(line, position));if (matches.size() >= count)break;}} else {LinearRange range = new LinearRange(start, end);PlanarRange position = new PlanarRange(lineNo, range.getFrom(), lineNo, range.getTo());- matches.add(new Match(line, position, getPrefixLines(lines, lineNo), getSuffixLines(lines, lineNo)));+ matches.add(new Match(line, position));if (matches.size() >= count)break;}@@ -196,7 +190,7 @@ public class TextQueryOption implements QueryOption {}public void applyConstraints(BooleanQuery.Builder builder) {- Preconditions.checkNotNull(term != null);+ Preconditions.checkNotNull(term);if (fileNames != null) {BooleanQuery.Builder subQueryBuilder = new BooleanQuery.Builder();@@ -220,27 +214,6 @@ public class TextQueryOption implements QueryOption {return new TextQueryOptionEditor(componentId, Model.of(this));}- private List<String> getPrefixLines(List<String> lines, int index) {- var prefixLines = new ArrayList<String>();- for (int i=index-1; i>=0; i--) {- prefixLines.add(lines.get(i));- if (prefixLines.size() >= CONTEXT_SIZE)- break;- }- Collections.reverse(prefixLines);- return prefixLines;- }-- private List<String> getSuffixLines(List<String> lines, int index) {- var suffixLines = new ArrayList<String>();- for (int i=index+1; i<lines.size(); i++) {- suffixLines.add(lines.get(i));- if (suffixLines.size() >= CONTEXT_SIZE)- break;- }- return suffixLines;- }-public static class Match implements Serializable {private static final long serialVersionUID = 1L;@@ -249,23 +222,15 @@ public class TextQueryOption implements QueryOption {private final PlanarRange position;- private final List<String> prefixLines;-- private final List<String> suffixLines;-- public Match(String line, @Nullable PlanarRange position,- List<String> prefixLines, List<String> suffixLines) {+ public Match(String line, PlanarRange position) {this.line = line;this.position = position;- this.prefixLines = prefixLines;- this.suffixLines = suffixLines;}public String getLine() {return line;}- @Nullablepublic PlanarRange getPosition() {return position;}diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.javaindex 2f0d0d7363..087b3cdea9 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultCodeCommentTextManager.java@@ -1,24 +1,21 @@package io.onedev.server.search.entitytext;-import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.server.cluster.ClusterManager;+import io.onedev.server.entitymanager.CodeCommentTouchManager;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.event.Listen;-import io.onedev.server.event.project.codecomment.CodeCommentDeleted;-import io.onedev.server.event.project.codecomment.CodeCommentEvent;-import io.onedev.server.event.project.codecomment.CodeCommentsDeleted;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Project;+import io.onedev.server.model.support.EntityTouch;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.util.concurrent.BatchWorkManager;import io.onedev.server.util.lucene.BooleanQueryBuilder;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.document.Document;-import org.apache.lucene.document.Field.Store;import org.apache.lucene.document.LongPoint;import org.apache.lucene.document.StringField;import org.apache.lucene.document.TextField;@@ -40,6 +37,8 @@ import java.util.List;import java.util.Map;import static io.onedev.server.util.lucene.LuceneUtils.escape;+import static org.apache.lucene.document.Field.Store.NO;+import static org.apache.lucene.search.BooleanClause.Occur.SHOULD;@Singletonpublic class DefaultCodeCommentTextManager extends ProjectTextManager<CodeComment>@@ -49,14 +48,16 @@ public class DefaultCodeCommentTextManager extends ProjectTextManager<CodeCommenprivate static final String FIELD_COMMENT = "comment";- private static final String FIELD_REPLIES = "replies";+ private static final String FIELD_REPLY = "reply";++ private final CodeCommentTouchManager touchManager;@Inject- public DefaultCodeCommentTextManager(Dao dao, BatchWorkManager batchWorkManager,- TransactionManager transactionManager,- ProjectManager projectManager,- ClusterManager clusterManager) {- super(dao, batchWorkManager, transactionManager, projectManager, clusterManager);+ public DefaultCodeCommentTextManager(Dao dao, BatchWorkManager batchWorkManager, TransactionManager transactionManager,+ ProjectManager projectManager, ClusterManager clusterManager,+ SessionManager sessionManager, CodeCommentTouchManager touchManager) {+ super(dao, batchWorkManager, transactionManager, projectManager, clusterManager, sessionManager);+ this.touchManager = touchManager;}public Object writeReplace() throws ObjectStreamException {@@ -65,74 +66,54 @@ public class DefaultCodeCommentTextManager extends ProjectTextManager<CodeCommen@Overrideprotected int getIndexVersion() {- return 4;+ return 5;}@Override- protected void addFields(Document document, CodeComment entity) {- document.add(new StringField(FIELD_PATH, entity.getMark().getPath(), Store.NO));- document.add(new TextField(FIELD_COMMENT, entity.getContent(), Store.NO));- StringBuilder builder = new StringBuilder();- for (CodeCommentReply reply: entity.getReplies())- builder.append(reply.getContent()).append("\n");- if (builder.length() != 0)- document.add(new TextField(FIELD_REPLIES, builder.toString(), Store.NO));+ protected List<? extends EntityTouch> queryTouchesAfter(Long projectId, Long afterTouchId) {+ return touchManager.queryTouchesAfter(projectId, afterTouchId, Integer.MAX_VALUE);}- @Sessional- @Listen- public void on(CodeCommentEvent event) {- requestIndex(event.getComment());- }- @Sessional- @Listen- public void on(CodeCommentsDeleted event) {- clusterManager.submitToAllServers(() -> {- deleteEntities(event.getCommentIds());- return null;- });- }-- @Sessional- @Listen- public void on(CodeCommentDeleted event) {- clusterManager.submitToAllServers(() -> {- deleteEntities(Lists.newArrayList(event.getCommentId()));- return null;- });+ @Override+ protected void addFields(Document document, CodeComment entity) {+ document.add(new StringField(FIELD_PATH, entity.getMark().getPath(), NO));+ document.add(new TextField(FIELD_COMMENT, entity.getContent(), NO));+ for (CodeCommentReply reply: entity.getReplies())+ document.add(new TextField(FIELD_REPLY, reply.getContent(), NO));}-+@Nullable- private Query buildQuery(Project project, String queryString) {- BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();- queryBuilder.add(LongPoint.newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.MUST);- BooleanQueryBuilder contentQueryBuilder = new BooleanQueryBuilder();-+ private EntityTextQuery buildQuery(Project project, String queryString) {var escaped = escape(queryString);if (escaped != null) {+ BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();+ queryBuilder.add(LongPoint.newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.MUST);+ BooleanQueryBuilder contentQueryBuilder = new BooleanQueryBuilder();+Query pathQuery = new BoostQuery(new WildcardQuery(new Term(FIELD_PATH, "*" + escaped + "*")), 0.75f);+ contentQueryBuilder.add(pathQuery, SHOULD);try (Analyzer analyzer = newAnalyzer()) {Map<String, Float> boosts = new HashMap<>();boosts.put(FIELD_COMMENT, 0.75f);- boosts.put(FIELD_REPLIES, 0.5f);+ boosts.put(FIELD_REPLY, 0.5f);MultiFieldQueryParser parser = new MultiFieldQueryParser(- new String[] {FIELD_COMMENT, FIELD_REPLIES}, analyzer, boosts) {+ new String[] {FIELD_COMMENT, FIELD_REPLY}, analyzer, boosts) {protected Query newTermQuery(Term term, float boost) {return new BoostQuery(new PrefixQuery(term), boost);}};- contentQueryBuilder.add(parser.parse(escaped), Occur.SHOULD);+ contentQueryBuilder.add(parser.parse(escaped), SHOULD);} catch (ParseException e) {throw new RuntimeException(e);}queryBuilder.add(contentQueryBuilder.build(), Occur.MUST);-- return queryBuilder.build();- } else {- return null;- }+ var query = queryBuilder.build();+ if (query != null)+ return new EntityTextQuery(query, Sets.newHashSet(project.getId()));+ }+ return null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.javaindex 26546e9870..bef17715b3 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@@ -1,59 +1,52 @@package io.onedev.server.search.entitytext;-import com.google.common.collect.Lists;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.server.cluster.ClusterManager;-import io.onedev.server.entitymanager.IssueFieldManager;-import io.onedev.server.entitymanager.IssueLinkManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.event.Listen;-import io.onedev.server.event.project.issue.*;+import io.onedev.server.entitymanager.*;+import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueComment;-import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.changedata.IssueChangeData;-import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;-import io.onedev.server.model.support.issue.changedata.IssueTitleChangeData;+import io.onedev.server.model.support.EntityTouch;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.AccessConfidentialIssues;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.concurrent.BatchWorkManager;-import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.lucene.BooleanQueryBuilder;import io.onedev.server.util.lucene.LuceneUtils;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.document.Document;-import org.apache.lucene.document.Field.Store;import org.apache.lucene.document.LongPoint;+import org.apache.lucene.document.StringField;import org.apache.lucene.document.TextField;import org.apache.lucene.index.Term;import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;import org.apache.lucene.queryparser.classic.ParseException;-import org.apache.lucene.search.BooleanClause.Occur;-import org.apache.lucene.search.BooleanQuery;import org.apache.lucene.search.BoostQuery;import org.apache.lucene.search.PrefixQuery;import org.apache.lucene.search.Query;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import java.io.ObjectStreamException;-import java.util.*;-import java.util.stream.Collectors;+import java.util.HashMap;+import java.util.HashSet;+import java.util.List;+import java.util.Map;+import static io.onedev.server.util.criteria.Criteria.forManyValues;+import static java.lang.String.valueOf;+import static java.util.stream.Collectors.toSet;+import static org.apache.lucene.document.Field.Store.NO;import static org.apache.lucene.document.LongPoint.newExactQuery;+import static org.apache.lucene.search.BooleanClause.Occur.MUST;+import static org.apache.lucene.search.BooleanClause.Occur.SHOULD;@Singletonpublic class DefaultIssueTextManager extends ProjectTextManager<Issue> implements IssueTextManager {-- private static final Logger logger = LoggerFactory.getLogger(DefaultIssueTextManager.class);private static final String FIELD_NUMBER = "number";@@ -63,23 +56,27 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implementprivate static final String FIELD_DESCRIPTION = "description";- private static final String FIELD_COMMENTS = "comments";+ private static final String FIELD_COMMENT = "comments";private final IssueFieldManager fieldManager;+ private final IssueLinkManager linkManager;+private final UserManager userManager;- private final IssueLinkManager linkManager;+ private final IssueTouchManager touchManager;@Inject- public DefaultIssueTextManager(Dao dao, BatchWorkManager batchWorkManager,- TransactionManager transactionManager, ProjectManager projectManager,- IssueFieldManager fieldManager, IssueLinkManager linkManager,- ClusterManager clusterManager, UserManager userManager) {- super(dao, batchWorkManager, transactionManager, projectManager, clusterManager);+ public DefaultIssueTextManager(Dao dao, BatchWorkManager batchWorkManager, UserManager userManager,+ TransactionManager transactionManager, ProjectManager projectManager,+ IssueFieldManager fieldManager, IssueLinkManager linkManager,+ ClusterManager clusterManager, SessionManager sessionManager,+ IssueTouchManager touchManager) {+ super(dao, batchWorkManager, transactionManager, projectManager, clusterManager, sessionManager);+ this.userManager = userManager;this.fieldManager = fieldManager;this.linkManager = linkManager;- this.userManager = userManager;+ this.touchManager = touchManager;}public Object writeReplace() throws ObjectStreamException {@@ -88,223 +85,116 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implement@Overrideprotected int getIndexVersion() {- return 5;+ return 6;+ }++ @Override+ protected List<? extends EntityTouch> queryTouchesAfter(Long projectId, Long afterTouchId) {+ return touchManager.queryTouchesAfter(projectId, afterTouchId, Integer.MAX_VALUE);}@Override- protected void addFields(Document document, Issue entity) {- document.add(new LongPoint(FIELD_NUMBER, entity.getNumber()));- document.add(new LongPoint(FIELD_CONFIDENTIAL, entity.isConfidential()?1:0));- document.add(new TextField(FIELD_TITLE, entity.getTitle(), Store.NO));+ protected void addFields(Document entityDoc, Issue entity) {+ entityDoc.add(new LongPoint(FIELD_NUMBER, entity.getNumber()));+ entityDoc.add(new StringField(FIELD_CONFIDENTIAL, valueOf(entity.isConfidential()), NO));+ entityDoc.add(new TextField(FIELD_TITLE, entity.getTitle(), NO));if (entity.getDescription() != null)- document.add(new TextField(FIELD_DESCRIPTION, entity.getDescription(), Store.NO));+ entityDoc.add(new TextField(FIELD_DESCRIPTION, entity.getDescription(), NO));StringBuilder builder = new StringBuilder();- for (IssueComment comment: entity.getComments()) {+ for (var comment: entity.getComments()) {if (!comment.getUser().equals(userManager.getSystem()))- builder.append(comment.getContent()).append("\n");+ entityDoc.add(new TextField(FIELD_COMMENT, comment.getContent(), NO));}- if (builder.length() != 0)- document.add(new TextField(FIELD_COMMENTS, builder.toString(), Store.NO));- }-- @Sessional- @Listen- public void on(IssueOpened event) {- requestIndex(event.getIssue());}- @Sessional- @Listen- public void on(IssueChanged event) {- IssueChangeData data = event.getChange().getData();- if (data instanceof IssueTitleChangeData || data instanceof IssueDescriptionChangeData)- requestIndex(event.getIssue());- }-- @Sessional- @Listen- public void on(IssueCommentCreated event) {- requestIndex(event.getIssue());- }+ @Nullable+ private EntityTextQuery buildQuery(@Nullable ProjectScope projectScope, String queryString) {+ var escaped = LuceneUtils.escape(queryString);+ if (escaped != null) {+ var applicableProjectIds = new HashSet<Long>();+ BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();+ if (projectScope != null) {+ var project = projectScope.getProject();+ applicableProjectIds.add(project.getId());+ if (projectScope.isRecursive())+ applicableProjectIds.addAll(projectManager.getSubtreeIds(project.getId()));+ if (projectScope.isInherited()) {+ for (var ancestor: project.getAncestors()) {+ if (SecurityUtils.canAccess(ancestor))+ applicableProjectIds.add(ancestor.getId());+ }+ }+ } else {+ applicableProjectIds.addAll(projectManager.getPermittedProjects(new AccessProject())+ .stream()+ .map(AbstractEntity::getId)+ .collect(toSet()));+ }++ if (!SecurityUtils.isAdministrator()) {+ var permittedProjectIds = projectManager.getPermittedProjects(new AccessConfidentialIssues())+ .stream()+ .map(AbstractEntity::getId)+ .collect(toSet());+ permittedProjectIds.retainAll(applicableProjectIds);+ var allIds = projectManager.getIds();+ BooleanQueryBuilder confidentialQueryBuilder = new BooleanQueryBuilder();+ confidentialQueryBuilder.add(forManyValues(+ FIELD_PROJECT_ID, permittedProjectIds, allIds), SHOULD);+ confidentialQueryBuilder.add(getTermQuery(FIELD_CONFIDENTIAL, valueOf(false)), SHOULD);+ queryBuilder.add(confidentialQueryBuilder.build(), MUST);+ }- @Sessional- @Listen- public void on(IssueCommentEdited event) {- requestIndex(event.getIssue());- }+ BooleanQueryBuilder contentQueryBuilder = new BooleanQueryBuilder();- @Sessional- @Listen- public void on(IssueCommentDeleted event) {- requestIndex(event.getIssue());- }-- @Sessional- @Listen- public void on(IssuesDeleted event) {- clusterManager.submitToAllServers(() -> {+ String numberString = queryString;+ if (numberString.startsWith("#"))+ numberString = numberString.substring(1);try {- deleteEntities(event.getIssueIds());- } catch (Exception e) {- logger.error("Error deleting entities", e);+ long number = Long.parseLong(numberString);+ contentQueryBuilder.add(new BoostQuery(newExactQuery(FIELD_NUMBER, number), 1f), SHOULD);+ } catch (NumberFormatException ignored) {}- return null;- });- }- @Sessional- @Listen- public void on(IssueDeleted event) {- clusterManager.submitToAllServers(() -> {- try {- deleteEntities(Lists.newArrayList(event.getIssueId()));- } catch (Exception e) {- logger.error("Error deleting entities", e);- }- return null;- });- }-- @Sessional- @Listen- public void on(IssuesMoved event) {- var localServer = clusterManager.getLocalServerAddress();- clusterManager.submitToAllServers(() -> {- if (!clusterManager.getLocalServerAddress().equals(localServer)) {- try {- deleteEntities(event.getIssueIds());- } catch (Exception e) {- logger.error("Error deleting entities", e);- }- }- return null;- });-- for (Long issueId: event.getIssueIds())- requestIndex(dao.load(Issue.class, issueId));- }-- @Sessional- @Listen- public void on(IssuesCopied event) {- for (Long issueId: event.getIssueIdMapping().values())- requestIndex(dao.load(Issue.class, issueId));- }-- @Sessional- @Listen- public void on(IssuesImported event) {- for (Long issueId: event.getIssueIds())- requestIndex(dao.load(Issue.class, issueId));- }-- @Nullable- private Query buildQuery(@Nullable ProjectScope projectScope, String queryString) {- BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();- if (projectScope != null) {- BooleanQueryBuilder projectQueryBuilder = new BooleanQueryBuilder();- Project project = projectScope.getProject();- if (projectScope.isRecursive())- projectQueryBuilder.add(buildQuery(projectManager.getSubtreeIds(project.getId())), Occur.SHOULD);- else if (SecurityUtils.canAccessConfidentialIssues(projectScope.getProject()))- projectQueryBuilder.add(newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.SHOULD);- else- projectQueryBuilder.add(getNonConfidentialQuery(project), Occur.SHOULD);-- if (projectScope.isInherited()) {- for (Project ancestor: projectScope.getProject().getAncestors()) {- if (SecurityUtils.canAccessConfidentialIssues(ancestor))- projectQueryBuilder.add(newExactQuery(FIELD_PROJECT_ID, ancestor.getId()), Occur.SHOULD);- else if (SecurityUtils.canAccess(ancestor))- projectQueryBuilder.add(getNonConfidentialQuery(ancestor), Occur.SHOULD);- }+ try (Analyzer analyzer = newAnalyzer()) {+ Map<String, Float> boosts = new HashMap<>();+ boosts.put(FIELD_TITLE, 0.75f);+ boosts.put(FIELD_DESCRIPTION, 0.5f);+ boosts.put(FIELD_COMMENT, 0.25f);+ MultiFieldQueryParser parser = new MultiFieldQueryParser(+ new String[]{FIELD_TITLE, FIELD_DESCRIPTION, FIELD_COMMENT}, analyzer, boosts) {+ @Override+ protected Query newTermQuery(Term term, float boost) {+ return new BoostQuery(new PrefixQuery(term), boost);+ }+ };+ contentQueryBuilder.add(parser.parse(escaped), SHOULD);+ } catch (ParseException e) {+ throw new RuntimeException(e);}- queryBuilder.add(projectQueryBuilder.build(), Occur.MUST);- } else if (!SecurityUtils.isAdministrator()) {- Collection<Long> projectIds = projectManager.getPermittedProjects(new AccessProject()).stream()- .map(it->it.getId())- .collect(Collectors.toSet());+ queryBuilder.add(contentQueryBuilder.build(), MUST);- if (!projectIds.isEmpty())- queryBuilder.add(buildQuery(projectIds), Occur.MUST);- else- return null;- }-- BooleanQueryBuilder contentQueryBuilder = new BooleanQueryBuilder();-- String numberString = queryString;- if (numberString.startsWith("#"))- numberString = numberString.substring(1);- try {- Long number = Long.valueOf(numberString);- contentQueryBuilder.add(new BoostQuery(newExactQuery(FIELD_NUMBER, number), 1f), Occur.SHOULD);- } catch (NumberFormatException e) {- }-- try (Analyzer analyzer = newAnalyzer()) {- Map<String, Float> boosts = new HashMap<>();- boosts.put(FIELD_TITLE, 0.75f);- boosts.put(FIELD_DESCRIPTION, 0.5f);- boosts.put(FIELD_COMMENTS, 0.25f);- MultiFieldQueryParser parser = new MultiFieldQueryParser(- new String[] {FIELD_TITLE, FIELD_DESCRIPTION, FIELD_COMMENTS}, analyzer, boosts) {- @Override- protected Query newTermQuery(Term term, float boost) {- return new BoostQuery(new PrefixQuery(term), boost);- }- };- var escaped = LuceneUtils.escape(queryString);- if (escaped != null)- contentQueryBuilder.add(parser.parse(escaped), Occur.SHOULD);- else- return null;- } catch (ParseException e) {- throw new RuntimeException(e);- }- queryBuilder.add(contentQueryBuilder.build(), Occur.MUST);-- return queryBuilder.build();- }-- private Query buildQuery(Collection<Long> projectIds) {- Collection<Long> allIds = projectManager.getIds();- if (SecurityUtils.isAdministrator()) {- return Criteria.forManyValues(FIELD_PROJECT_ID, projectIds, allIds);- } else {- Collection<Long> projectIdsWithConfidentialIssuePermission = new ArrayList<>();- Collection<Long> projectIdsWithoutConfidentialIssuePermission = new ArrayList<>();- for (Long projectId: projectIds) {- Project project = projectManager.load(projectId);- if (SecurityUtils.canAccessConfidentialIssues(project))- projectIdsWithConfidentialIssuePermission.add(projectId);- else- projectIdsWithoutConfidentialIssuePermission.add(projectId);- }- BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();- queryBuilder.add(Criteria.forManyValues(- FIELD_PROJECT_ID, projectIdsWithConfidentialIssuePermission, allIds), Occur.SHOULD);- BooleanQueryBuilder nonConfidentialQueryBuilder = new BooleanQueryBuilder();- nonConfidentialQueryBuilder.add(Criteria.forManyValues(- FIELD_PROJECT_ID, projectIdsWithoutConfidentialIssuePermission, allIds), Occur.MUST);- nonConfidentialQueryBuilder.add(newExactQuery(FIELD_CONFIDENTIAL, 0L), Occur.MUST);- queryBuilder.add(nonConfidentialQueryBuilder.build(), Occur.SHOULD);- return queryBuilder.build();+ var query = queryBuilder.build();+ if (query != null)+ return new EntityTextQuery(query, applicableProjectIds);}- }-- private BooleanQuery getNonConfidentialQuery(Project project) {- BooleanQueryBuilder builder = new BooleanQueryBuilder();- builder.add(newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.MUST);- builder.add(newExactQuery(FIELD_CONFIDENTIAL, 0L), Occur.MUST);- return builder.build();+ return null;}@Overridepublic List<Issue> query(@Nullable ProjectScope projectScope, String queryString,boolean loadFieldsAndLinks, int firstResult, int maxResults) {var issues = search(buildQuery(projectScope, queryString), firstResult, maxResults);-+ if (projectScope != null) {+ for (var it = issues.iterator(); it.hasNext(); ) {+ var issue = it.next();+ if (!issue.getProject().equals(projectScope.getProject())+ && (!projectScope.isInherited() || !issue.getProject().isSelfOrAncestorOf(projectScope.getProject())+ && (!projectScope.isRecursive() || !projectScope.getProject().isSelfOrAncestorOf(issue.getProject())))) {+ it.remove();+ }+ }+ }if (loadFieldsAndLinks && !issues.isEmpty()) {fieldManager.populateFields(issues);linkManager.populateLinks(issues);diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.javaindex 9778729fad..f6a3a54b8a 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@@ -1,32 +1,22 @@package io.onedev.server.search.entitytext;-import com.google.common.collect.Lists;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.server.cluster.ClusterManager;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.PullRequestReviewManager;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.event.Listen;-import io.onedev.server.event.project.pullrequest.*;+import io.onedev.server.entitymanager.*;+import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChangeData;+import io.onedev.server.model.support.EntityTouch;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ReadCode;import io.onedev.server.util.concurrent.BatchWorkManager;-import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.lucene.BooleanQueryBuilder;import io.onedev.server.util.lucene.LuceneUtils;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.document.Document;-import org.apache.lucene.document.Field.Store;import org.apache.lucene.document.LongPoint;import org.apache.lucene.document.TextField;import org.apache.lucene.index.Term;@@ -41,12 +31,13 @@ import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import java.io.ObjectStreamException;-import java.util.Collection;import java.util.HashMap;+import java.util.HashSet;import java.util.List;import java.util.Map;-import java.util.stream.Collectors;+import static java.util.stream.Collectors.toList;+import static org.apache.lucene.document.Field.Store.NO;import static org.apache.lucene.document.LongPoint.newExactQuery;@Singleton@@ -59,7 +50,7 @@ public class DefaultPullRequestTextManager extends ProjectTextManager<PullRequesprivate static final String FIELD_DESCRIPTION = "description";- private static final String FIELD_COMMENTS = "comments";+ private static final String FIELD_COMMENT = "comment";private final PullRequestReviewManager reviewManager;@@ -67,15 +58,19 @@ public class DefaultPullRequestTextManager extends ProjectTextManager<PullRequesprivate final UserManager userManager;+ private final PullRequestTouchManager touchManager;+@Injectpublic DefaultPullRequestTextManager(Dao dao, UserManager userManager, BatchWorkManager batchWorkManager,TransactionManager transactionManager, ProjectManager projectManager,PullRequestReviewManager reviewManager, BuildManager buildManager,- ClusterManager clusterManager) {- super(dao, batchWorkManager, transactionManager, projectManager, clusterManager);+ ClusterManager clusterManager, SessionManager sessionManager,+ PullRequestTouchManager touchManager) {+ super(dao, batchWorkManager, transactionManager, projectManager, clusterManager, sessionManager);this.reviewManager = reviewManager;this.buildManager = buildManager;this.userManager = userManager;+ this.touchManager = touchManager;}public Object writeReplace() throws ObjectStreamException {@@ -84,126 +79,72 @@ public class DefaultPullRequestTextManager extends ProjectTextManager<PullReques@Overrideprotected int getIndexVersion() {- return 4;+ return 5;+ }++ @Override+ protected List<? extends EntityTouch> queryTouchesAfter(Long projectId, Long afterTouchId) {+ return touchManager.queryTouchesAfter(projectId, afterTouchId, Integer.MAX_VALUE);}@Override- protected void addFields(Document document, PullRequest entity) {- document.add(new LongPoint(FIELD_NUMBER, entity.getNumber()));- document.add(new TextField(FIELD_TITLE, entity.getTitle(), Store.NO));+ protected void addFields(Document entityDoc, PullRequest entity) {+ entityDoc.add(new LongPoint(FIELD_NUMBER, entity.getNumber()));+ entityDoc.add(new TextField(FIELD_TITLE, entity.getTitle(), NO));if (entity.getDescription() != null)- document.add(new TextField(FIELD_DESCRIPTION, entity.getDescription(), Store.NO));- StringBuilder builder = new StringBuilder();+ entityDoc.add(new TextField(FIELD_DESCRIPTION, entity.getDescription(), NO));for (PullRequestComment comment: entity.getComments()) {if (!comment.getUser().equals(userManager.getSystem()))- builder.append(comment.getContent()).append("\n");+ entityDoc.add(new TextField(FIELD_COMMENT, comment.getContent(), NO));}- if (builder.length() != 0)- document.add(new TextField(FIELD_COMMENTS, builder.toString(), Store.NO));- }-- @Sessional- @Listen- public void on(PullRequestOpened event) {- requestIndex(event.getRequest());- }-- @Sessional- @Listen- public void on(PullRequestChanged event) {- PullRequestChangeData data = event.getChange().getData();- if (data instanceof PullRequestTitleChangeData || data instanceof PullRequestDescriptionChangeData)- requestIndex(event.getRequest());- }-- @Sessional- @Listen- public void on(PullRequestCommentCreated event) {- requestIndex(event.getRequest());- }-- @Sessional- @Listen- public void on(PullRequestCommentEdited event) {- requestIndex(event.getRequest());- }-- @Sessional- @Listen- public void on(PullRequestCommentDeleted event) {- requestIndex(event.getRequest());- }-- @Sessional- @Listen- public void on(PullRequestsDeleted event) {- clusterManager.submitToAllServers(() -> {- deleteEntities(event.getRequestIds());- return null;- });- }-- @Sessional- @Listen- public void on(PullRequestDeleted event) {- clusterManager.submitToAllServers(() -> {- deleteEntities(Lists.newArrayList(event.getRequestId()));- return null;- });}@Nullable- private Query buildQuery(@Nullable Project project, String queryString) {- BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();- if (project != null) {- queryBuilder.add(newExactQuery(FIELD_PROJECT_ID, project.getId()), Occur.MUST);- } else if (!SecurityUtils.isAdministrator()) {- 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);+ private EntityTextQuery buildQuery(@Nullable Project project, String queryString) {+ var escaped = LuceneUtils.escape(queryString);+ if (escaped != null) {+ var applicableProjectIds = new HashSet<Long>();+ if (project != null) {+ applicableProjectIds.add(project.getId());} else {- return null;+ applicableProjectIds.addAll(projectManager.getPermittedProjects(new ReadCode())+ .stream().map(AbstractEntity::getId).collect(toList()));}- }- BooleanQueryBuilder contentQueryBuilder = new BooleanQueryBuilder();-- String numberString = queryString;- if (numberString.startsWith("#"))- numberString = numberString.substring(1);- try {- Long number = Long.valueOf(numberString);- contentQueryBuilder.add(new BoostQuery(newExactQuery(FIELD_NUMBER, number), 1f), Occur.SHOULD);- } catch (NumberFormatException ignored) {- }-- try (Analyzer analyzer = newAnalyzer()) {- Map<String, Float> boosts = new HashMap<>();- boosts.put(FIELD_TITLE, 0.75f);- boosts.put(FIELD_DESCRIPTION, 0.5f);- boosts.put(FIELD_COMMENTS, 0.25f);- MultiFieldQueryParser parser = new MultiFieldQueryParser(- new String[] {FIELD_TITLE, FIELD_DESCRIPTION, FIELD_COMMENTS}, analyzer, boosts) {-- protected Query newTermQuery(Term term, float boost) {- return new BoostQuery(new PrefixQuery(term), boost);+ if (!applicableProjectIds.isEmpty()) {+ BooleanQueryBuilder contentQueryBuilder = new BooleanQueryBuilder();++ String numberString = queryString;+ if (numberString.startsWith("#"))+ numberString = numberString.substring(1);+ try {+ long number = Long.parseLong(numberString);+ contentQueryBuilder.add(new BoostQuery(newExactQuery(FIELD_NUMBER, number), 1f), Occur.SHOULD);+ } catch (NumberFormatException ignored) {}-- };- var escaped = LuceneUtils.escape(queryString);- if (escaped != null)- contentQueryBuilder.add(parser.parse(escaped), Occur.SHOULD);- else- return null;- } catch (ParseException e) {- throw new RuntimeException(e);++ try (Analyzer analyzer = newAnalyzer()) {+ Map<String, Float> boosts = new HashMap<>();+ boosts.put(FIELD_TITLE, 0.75f);+ boosts.put(FIELD_DESCRIPTION, 0.5f);+ boosts.put(FIELD_COMMENT, 0.25f);+ MultiFieldQueryParser parser = new MultiFieldQueryParser(+ new String[]{FIELD_TITLE, FIELD_DESCRIPTION, FIELD_COMMENT}, analyzer, boosts) {++ protected Query newTermQuery(Term term, float boost) {+ return new BoostQuery(new PrefixQuery(term), boost);+ }++ };+ contentQueryBuilder.add(parser.parse(escaped), Occur.SHOULD);+ } catch (ParseException e) {+ throw new RuntimeException(e);+ }+ var contentQuery = contentQueryBuilder.build();+ if (contentQuery != null)+ return new EntityTextQuery(contentQuery, applicableProjectIds);+ }}- queryBuilder.add(contentQueryBuilder.build(), Occur.MUST);-- return queryBuilder.build();+ return null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextQuery.java b/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextQuery.javanew file mode 100644index 0000000000..af114a1053--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextQuery.java@@ -0,0 +1,25 @@+package io.onedev.server.search.entitytext;++import org.apache.lucene.search.Query;++import java.util.Collection;++public class EntityTextQuery {++ private final Query contentQuery;++ private final Collection<Long> applicableProjectIds;++ public EntityTextQuery(Query contentQuery, Collection<Long> applicableProjectIds) {+ this.contentQuery = contentQuery;+ this.applicableProjectIds = applicableProjectIds;+ }++ public Query getContentQuery() {+ return contentQuery;+ }++ public Collection<Long> getApplicableProjectIds() {+ return applicableProjectIds;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.javaindex aafcbe7d44..cb20fc0b41 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java@@ -8,20 +8,28 @@ import io.onedev.server.cluster.ClusterManager;import io.onedev.server.cluster.ClusterTask;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.event.Listen;+import io.onedev.server.event.entity.EntityPersisted;+import io.onedev.server.event.project.ActiveServerChanged;import io.onedev.server.event.project.ProjectDeleted;import io.onedev.server.event.system.SystemStarted;-import io.onedev.server.event.system.SystemStopping;+import io.onedev.server.event.system.SystemStarting;+import io.onedev.server.event.system.SystemStopped;import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.IssueTouch;+import io.onedev.server.model.support.EntityTouch;import io.onedev.server.model.support.ProjectBelonging;+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;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.util.ReflectionUtils;-import io.onedev.server.util.WriterRunnable;import io.onedev.server.util.concurrent.BatchWorkManager;import io.onedev.server.util.concurrent.BatchWorker;import io.onedev.server.util.concurrent.Prioritized;+import io.onedev.server.util.lucene.BooleanQueryBuilder;+import io.onedev.server.util.lucene.LuceneUtils;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.analysis.CharArraySet;import org.apache.lucene.analysis.WordlistLoader;@@ -46,7 +54,6 @@ import org.apache.lucene.document.LongPoint;import org.apache.lucene.document.StoredField;import org.apache.lucene.document.StringField;import org.apache.lucene.index.*;-import org.apache.lucene.index.IndexWriterConfig.OpenMode;import org.apache.lucene.queryparser.classic.ParseException;import org.apache.lucene.queryparser.classic.QueryParser;import org.apache.lucene.search.*;@@ -63,10 +70,16 @@ import java.io.IOException;import java.io.Serializable;import java.nio.charset.StandardCharsets;import java.util.*;+import java.util.function.Function;+import static com.google.common.collect.Lists.partition;+import static io.onedev.server.util.criteria.Criteria.forManyValues;import static java.lang.Long.valueOf;-import static java.util.Comparator.comparingInt;+import static java.lang.Math.min;+import static java.util.stream.Collectors.toList;+import static org.apache.lucene.document.Field.Store.YES;import static org.apache.lucene.document.LongPoint.newExactQuery;+import static org.apache.lucene.search.BooleanClause.Occur.MUST;public abstract class ProjectTextManager<T extends ProjectBelonging> implements Serializable {@@ -75,19 +88,21 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implementsprivate static final Logger logger = LoggerFactory.getLogger(ProjectTextManager.class);private static final String FIELD_TYPE = "type";++ private static final String TYPE_META = "meta";++ private static final String FIELD_VERSION = "version";- private static final String FIELD_INDEX_VERSION = "indexVersion";-- private static final String FIELD_LAST_ENTITY_ID = "lastEntityId";-+ private static final String FIELD_TOUCH_ID = "touchId";+private static final String FIELD_ENTITY_ID = "entityId";protected static final String FIELD_PROJECT_ID = "projectId";private static final int INDEXING_PRIORITY = 20;-+private static final int BATCH_SIZE = 5000;-+private static final CharArraySet STOP_WORDS = new CharArraySet(1000, false);static {@@ -126,13 +141,15 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implementsprotected final ProjectManager projectManager;protected final ClusterManager clusterManager;++ private final SessionManager sessionManager;private volatile SearcherManager searcherManager;@SuppressWarnings("unchecked")- public ProjectTextManager(Dao dao, BatchWorkManager batchWorkManager,- TransactionManager transactionManager, ProjectManager projectManager,- ClusterManager clusterManager) {+ public ProjectTextManager(Dao dao, BatchWorkManager batchWorkManager,+ TransactionManager transactionManager, ProjectManager projectManager,+ ClusterManager clusterManager, SessionManager sessionManager) {List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(ProjectTextManager.class, getClass());if (typeArguments.size() == 1 && AbstractEntity.class.isAssignableFrom(typeArguments.get(0))) {entityClass = (Class<T>) typeArguments.get(0);@@ -145,27 +162,11 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implementsthis.batchWorkManager = batchWorkManager;this.transactionManager = transactionManager;this.clusterManager = clusterManager;+ this.sessionManager = sessionManager;}- protected TermQuery getTermQuery(String name, String value) {- return new TermQuery(getTerm(name, value));- }-- protected Term getTerm(String name, String value) {- return new Term(name, value);- }-- private String getIndexName() {- return WordUtils.uncamel(entityClass.getSimpleName()).replace(" ", "_").toLowerCase();- }-- private File getIndexDir() {- return new File(OneDev.getIndexDir(), getIndexName());- }-- @Sessional@Listen- public void on(SystemStarted event) {+ public void on(SystemStarting event) {File indexDir = getIndexDir();FileUtils.createDir(indexDir);try {@@ -174,17 +175,19 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implementsif (DirectoryReader.indexExists(directory)) {try (IndexReader reader = DirectoryReader.open(directory)) {IndexSearcher searcher = new IndexSearcher(reader);- indexVersion = getIndexVersion(searcher);- } catch (IndexFormatTooOldException e) {+ Document doc = readMetaDoc(searcher, 0L);+ if (doc != null)+ indexVersion = Integer.parseInt(doc.get(FIELD_VERSION));+ } catch (IndexFormatTooOldException ignored) {}}if (indexVersion != getIndexVersion()) {FileUtils.cleanDir(indexDir);- doWithWriter(writer -> {+ callWithWriter(writer -> {Document document = new Document();- document.add(new StringField(FIELD_TYPE, FIELD_INDEX_VERSION, Store.NO));- document.add(new StoredField(FIELD_INDEX_VERSION, String.valueOf(getIndexVersion())));- writer.updateDocument(getTerm(FIELD_TYPE, FIELD_INDEX_VERSION), document);+ document.add(new StoredField(FIELD_VERSION, String.valueOf(getIndexVersion())));+ updateMetaDoc(writer, 0L, document);+ return null;});}searcherManager = new SearcherManager(directory, null);@@ -192,11 +195,16 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implementsthrow new RuntimeException(e);}- batchWorkManager.submit(getBatchWorker(), new IndexWork(INDEXING_PRIORITY, null));}@Listen- public void on(SystemStopping event) {+ public void on(SystemStarted event) {+ for (var projectId: projectManager.getActiveIds())+ requestToIndex(projectId);+ }++ @Listen+ public void on(SystemStopped event) {if (searcherManager != null) {try {searcherManager.close();@@ -205,149 +213,131 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implements}}}-- protected void deleteEntities(Collection<Long> entityIds) {- doWithWriter(writer -> {- for (Long entityId: entityIds)- writer.deleteDocuments(getTerm(FIELD_ENTITY_ID, String.valueOf(entityId)));- });- }@Sessional@Listenpublic void on(ProjectDeleted event) {Long projectId = event.getProjectId();clusterManager.submitToAllServers(() -> {- doWithWriter(writer -> writer.deleteDocuments(newExactQuery(FIELD_PROJECT_ID, projectId)));- return null;- });- }-- protected void requestIndex(T entity) {- batchWorkManager.submit(getBatchWorker(), new IndexWork(INDEXING_PRIORITY, entity.getId()));- }-- protected synchronized void doWithWriter(WriterRunnable runnable) {- File indexDir = getIndexDir();- try (Directory directory = FSDirectory.open(indexDir.toPath()); Analyzer analyzer = newAnalyzer()) {- IndexWriterConfig writerConfig = new IndexWriterConfig(analyzer);- writerConfig.setOpenMode(OpenMode.CREATE_OR_APPEND);- try (IndexWriter writer = new IndexWriter(directory, writerConfig)) {+ callWithWriter(writer -> {try {- runnable.run(writer);- writer.commit();- } catch (Exception e) {- writer.rollback();- throw ExceptionUtils.unchecked(e);- } finally {- if (searcherManager != null)- searcherManager.maybeRefresh();+ return writer.deleteDocuments(newExactQuery(FIELD_PROJECT_ID, projectId));+ } catch (IOException e) {+ throw new RuntimeException(e);}+ });+ return null;+ });+ }++ @Transactional+ @Listen+ public void on(EntityPersisted event) {+ if (event.getEntity() instanceof EntityTouch) {+ EntityTouch touch = (EntityTouch) event.getEntity();+ if (touch.getEntityClass() == entityClass) {+ var projectId = touch.getProjectId();+ transactionManager.runAfterCommit(() -> {+ projectManager.submitToActiveServer(projectId, () -> {+ requestToIndex(projectId);+ return null;+ });+ });}- } catch (IOException e) {- throw new RuntimeException(e);}}- protected Analyzer newAnalyzer() {- return new StandardAnalyzer(STOP_WORDS);+ @Listen+ public void on(ActiveServerChanged event) {+ for(var projectId: event.getProjectIds())+ requestToIndex(projectId);}-- private int getIndexVersion(IndexSearcher searcher) throws IOException {- TopDocs topDocs = searcher.search(getTermQuery(FIELD_TYPE, FIELD_INDEX_VERSION), 1);- if (topDocs.scoreDocs.length != 0) {- Document doc = searcher.doc(topDocs.scoreDocs[0].doc);- return Integer.parseInt(doc.get(FIELD_INDEX_VERSION));- } else {- return -1;- }++ protected <R> R callWithSearcher(Function<IndexSearcher, R> func) {+ return LuceneUtils.callWithSearcher(getIndexDir(), func);}-- private Long getLastEntityId(IndexSearcher searcher) throws IOException {- TopDocs topDocs = searcher.search(getTermQuery(FIELD_TYPE, FIELD_LAST_ENTITY_ID), 1);- if (topDocs.scoreDocs.length != 0) {- Document doc = searcher.doc(topDocs.scoreDocs[0].doc);- return valueOf(doc.get(FIELD_LAST_ENTITY_ID));- } else {- return 0L;++ protected synchronized <R> R callWithWriter(Function<IndexWriter, R> func) {+ try (Analyzer analyzer = newAnalyzer()) {+ return LuceneUtils.callWithWriter(getIndexDir(), analyzer, func);+ } finally {+ if (searcherManager != null) {+ try {+ searcherManager.maybeRefresh();+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }}}- private BatchWorker getBatchWorker() {- return new BatchWorker("index:" + entityClass.getSimpleName()) {+ protected void requestToIndex(Long projectId) {+ var batchWorker = new BatchWorker("project-" + projectId + "-indexText-" + entityClass.getSimpleName()) {@Overridepublic void doWorks(List<Prioritized> works) {String entityName = WordUtils.uncamel(entityClass.getSimpleName()).toLowerCase();-- boolean checkNewEntities = false;- Collection<Long> entityIds = new HashSet<>();- for (Prioritized work : works) {- Long entityId = ((IndexWork) work).getEntityId();- if (entityId != null)- entityIds.add(entityId);- else- checkNewEntities = true;- }-- index(entityIds);-- if (checkNewEntities) {- // do the work batch by batch to avoid consuming too much memory- while (index());- }-- logger.debug("Indexed {}s", entityName);- }-- };- }-- @Sessional- protected void index(Collection<Long> entityIds) {- doWithWriter(writer -> {- for (Long entityId : entityIds) {- T entity = dao.load(entityClass, entityId);- index(writer, entity);- }- });- }-- @Sessional- protected boolean index() {- File indexDir = getIndexDir();- try (Directory directory = FSDirectory.open(indexDir.toPath())) {- Long lastEntityId = 0L;- if (DirectoryReader.indexExists(directory)) {- try (IndexReader reader = DirectoryReader.open(directory)) {- lastEntityId = getLastEntityId(new IndexSearcher(reader));- }+ String projectPath = projectManager.findFacadeById(projectId).getPath();+ logger.debug("Indexing {} (project: {})", entityName, projectPath);++ var touchInfo = callWithSearcher(searcher -> {+ var touchId = 0L;+ var metaDoc = readMetaDoc(searcher, projectId);+ if (metaDoc != null)+ touchId = metaDoc.getField(FIELD_TOUCH_ID).numericValue().longValue();++ var touches = queryTouchesAfter(projectId, touchId);+ if (!touches.isEmpty()) {+ var entityIds = new HashSet<Long>();+ var maxTouchId = 0L;+ for (var touch: touches) {+ entityIds.add(touch.getEntityId());+ if (touch.getId() > maxTouchId)+ maxTouchId = touch.getId();+ }+ return new EntityTouchInfo(maxTouchId, entityIds);+ } else {+ return null;+ }+ });++ callWithWriter(writer -> {+ if (touchInfo != null) {+ for (var partition: partition(new ArrayList<>(touchInfo.getEntityIds()), BATCH_SIZE)) {+ sessionManager.run(() -> {+ try {+ for (var entityId: partition) {+ var queryBuilder = new BooleanQueryBuilder();+ queryBuilder.add(newExactQuery(FIELD_PROJECT_ID, projectId), MUST);+ queryBuilder.add(getTermQuery(FIELD_ENTITY_ID, String.valueOf(entityId)), MUST);+ writer.deleteDocuments(queryBuilder.build());+ var entity = dao.get(entityClass, entityId);+ if (entity != null && entity.getProject().getId().equals(projectId)) {+ Document entityDoc = new Document();+ entityDoc.add(new LongPoint(FIELD_PROJECT_ID, entity.getProject().getId()));+ entityDoc.add(new StringField(FIELD_ENTITY_ID, String.valueOf(entityId), YES));+ addFields(entityDoc, entity);+ writer.addDocument(entityDoc);+ }+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ });+ }+ var metaDoc = new Document();+ metaDoc.add(new StoredField(FIELD_TOUCH_ID, touchInfo.getTouchId()));+ updateMetaDoc(writer, projectId, metaDoc);+ }+ return null;+ });+ logger.debug("Indexed {} (project: {})", entityName, projectPath);}- List<T> unprocessedEntities = dao.queryAfter(entityClass, lastEntityId, BATCH_SIZE);-- doWithWriter(writer -> {- var localServer = clusterManager.getLocalServerAddress();- T lastEntity = null;- for (T entity: unprocessedEntities) {- if (localServer.equals(projectManager.getActiveServer(entity.getProject().getId(), false)))- index(writer, entity);- lastEntity = entity;- }-- if (lastEntity != null) {- Document document = new Document();- document.add(new StringField(FIELD_TYPE, FIELD_LAST_ENTITY_ID, Store.NO));- document.add(new StoredField(FIELD_LAST_ENTITY_ID, String.valueOf(lastEntity.getId())));- writer.updateDocument(getTerm(FIELD_TYPE, FIELD_LAST_ENTITY_ID), document);- }- });-- return unprocessedEntities.size() == BATCH_SIZE;- } catch (IOException e) {- throw new RuntimeException(e);- }- }+ };+ batchWorkManager.submit(batchWorker, new IndexWork(INDEXING_PRIORITY));+ }+private Query parse(String queryString) {try {QueryParser parser = new QueryParser("", newAnalyzer()) {@@ -366,16 +356,26 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implements}}- protected long count(@Nullable Query query) {+ private Query buildQuery(Map<String, Collection<Long>> projectIdsByServer, String contentQueryString) {+ var queryBuilder = new BooleanQueryBuilder();+ var allIds = projectManager.getIds();+ var projectIds = projectIdsByServer.get(clusterManager.getLocalServerAddress());+ queryBuilder.add(forManyValues(FIELD_PROJECT_ID, projectIds, allIds), MUST);+ queryBuilder.add(parse(contentQueryString), MUST);+ return queryBuilder.build();+ }++ protected long count(@Nullable EntityTextQuery query) {if (query != null) {- String queryString = query.toString();- return clusterManager.runOnAllServers(() -> {+ String contentQueryString = query.getContentQuery().toString();+ var projectIdsByServer = projectManager.groupByActiveServers(query.getApplicableProjectIds());+ return clusterManager.runOnServers(projectIdsByServer.keySet(), () -> {if (searcherManager != null) {try {IndexSearcher indexSearcher = searcherManager.acquire();try {TotalHitCountCollector collector = new TotalHitCountCollector();- indexSearcher.search(parse(queryString), collector);+ indexSearcher.search(buildQuery(projectIdsByServer, contentQueryString), collector);return (long) collector.getTotalHits();} finally {searcherManager.release(indexSearcher);@@ -392,17 +392,18 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implements}}- protected List<T> search(@Nullable Query query, int firstResult, int maxResults) {+ protected List<T> search(@Nullable EntityTextQuery query, int firstResult, int maxResults) {if (query != null) {- String queryString = query.toString();+ String contentQueryString = query.getContentQuery().toString();+ var projectIdsByServer = projectManager.groupByActiveServers(query.getApplicableProjectIds());Map<Long, Float> entityScores = new HashMap<>();- for (var entry : clusterManager.runOnAllServers((ClusterTask<Map<Long, Float>>) () -> {+ for (var entry : clusterManager.runOnServers(projectIdsByServer.keySet(), (ClusterTask<Map<Long, Float>>) () -> {if (searcherManager != null) {try {IndexSearcher searcher = searcherManager.acquire();try {Map<Long, Float> innerEntityScores = new HashMap<>();- TopDocs topDocs = searcher.search(parse(queryString), firstResult + maxResults);+ TopDocs topDocs = searcher.search(buildQuery(projectIdsByServer, contentQueryString), firstResult + maxResults);for (var scoreDoc : topDocs.scoreDocs) {Document doc = searcher.doc(scoreDoc.doc);innerEntityScores.put(valueOf(doc.get(FIELD_ENTITY_ID)), scoreDoc.score);@@ -421,21 +422,26 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implementsentityScores.putAll(entry.getValue());}- List<Long> entityIds = new ArrayList<>(entityScores.keySet());- entityIds.sort((o1, o2) -> {- Float score1 = entityScores.get(o1);- Float score2 = entityScores.get(o2);- return Float.compare(score1, score2) * -1;- });-- if (firstResult < entityIds.size()) {+ List<Map.Entry<Long, Float>> entries = new ArrayList<>(entityScores.entrySet());+ entries.sort((o1, o2) -> o2.getValue().compareTo(o1.getValue()));++ if (firstResult < entries.size()) {+ entries = entries.subList(firstResult, min(firstResult + maxResults, entries.size()));EntityCriteria<T> criteria = EntityCriteria.of(entityClass);criteria.add(Restrictions.in(AbstractEntity.PROP_ID,- entityIds.subList(firstResult, Math.min(firstResult + maxResults, entityIds.size()))));-- List<T> entities = dao.query(criteria);- entities.sort(comparingInt(o -> entityIds.indexOf(o.getId())));+ entries.stream().map(Map.Entry::getKey).collect(toList())));++ var mapOfEntities = new HashMap<Long, T>();+ for (var entity: dao.query(criteria))+ mapOfEntities.put(entity.getId(), entity);++ var entities = new ArrayList<T>();+ for (var entry: entries) {+ var entity = mapOfEntities.get(entry.getKey());+ if (entity != null)+ entities.add(entity);+ }return entities;} else {return new ArrayList<>();@@ -444,33 +450,91 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implementsreturn new ArrayList<>();}}++ private String getIndexName() {+ return WordUtils.uncamel(entityClass.getSimpleName()).replace(" ", "_").toLowerCase();+ }- private void index(IndexWriter writer, T entity) throws IOException {- Document document = new Document();- document.add(new StringField(FIELD_ENTITY_ID, String.valueOf(entity.getId()), Store.YES));- document.add(new LongPoint(FIELD_PROJECT_ID, entity.getProject().getId()));- addFields(document, entity);- writer.updateDocument(getTerm(FIELD_ENTITY_ID, String.valueOf(entity.getId())), document);+ private File getIndexDir() {+ return new File(OneDev.getIndexDir(), getIndexName());+ }++ protected Analyzer newAnalyzer() {+ return new StandardAnalyzer(STOP_WORDS);+ }++ protected void updateMetaDoc(IndexWriter writer, Long projectId, Document document) {+ document.add(new StringField(FIELD_TYPE, TYPE_META, Store.NO));+ document.add(new LongPoint(FIELD_PROJECT_ID, projectId));+ try {+ writer.deleteDocuments(newMetaQuery(projectId));+ writer.addDocument(document);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ private Query newMetaQuery(Long projectId) {+ var queryBuilder = new BooleanQueryBuilder();+ queryBuilder.add(getTermQuery(FIELD_TYPE, TYPE_META), MUST);+ queryBuilder.add(newExactQuery(FIELD_PROJECT_ID, projectId), MUST);+ return queryBuilder.build();+ }++ @Nullable+ protected Document readMetaDoc(IndexSearcher searcher, Long projectId) {+ try {+ TopDocs topDocs = searcher.search(newMetaQuery(projectId), 1);+ if (topDocs.scoreDocs.length != 0)+ return searcher.doc(topDocs.scoreDocs[0].doc);+ else+ return null;+ } catch (IOException e) {+ throw new RuntimeException(e);+ }}- protected abstract int getIndexVersion();+ protected TermQuery getTermQuery(String name, String value) {+ return new TermQuery(getTerm(name, value));+ }++ protected Term getTerm(String name, String value) {+ return new Term(name, value);+ }- protected abstract void addFields(Document document, T entity);+ protected abstract int getIndexVersion();++ @Nullable+ protected abstract List<? extends EntityTouch> queryTouchesAfter(Long projectId, Long touchId);++ protected abstract void addFields(Document entityDoc, T entity);private static class IndexWork extends Prioritized {-- private final Long entityId;- public IndexWork(int priority, @Nullable Long entityId) {+ public IndexWork(int priority) {super(priority);- this.entityId = entityId;}- @Nullable- public Long getEntityId() {- return entityId;+ }++ private static class EntityTouchInfo {++ private final Long touchId;++ private final Collection<Long> entityIds;++ public EntityTouchInfo(Long touchId, Collection<Long> entityIds) {+ this.touchId = touchId;+ this.entityIds = entityIds;}- }+ public Long getTouchId() {+ return touchId;+ }+ public Collection<Long> getEntityIds() {+ return entityIds;+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.javaindex d5585ea964..0c43fa785b 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@@ -1,167 +1,156 @@-package io.onedev.server.security.realm;--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;--import javax.inject.Inject;--import org.apache.shiro.authz.AuthorizationInfo;-import org.apache.shiro.authz.Permission;-import org.apache.shiro.realm.AuthorizingRealm;-import org.apache.shiro.subject.PrincipalCollection;-import org.apache.wicket.MetaDataKey;-import org.apache.wicket.request.cycle.RequestCycle;--import com.google.common.collect.Lists;--import io.onedev.server.entitymanager.GroupManager;-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 GroupManager groupManager;-- protected final ProjectManager projectManager;-- protected final SessionManager sessionManager;-- protected final SettingManager settingManager;-- @SuppressWarnings("serial")- private static final MetaDataKey<Map<Long, AuthorizationInfo>> AUTHORIZATION_INFOS =- new MetaDataKey<Map<Long, AuthorizationInfo>>() {};-- @Inject- public AbstractAuthorizingRealm(UserManager userManager, GroupManager groupManager,- ProjectManager projectManager, SessionManager sessionManager, SettingManager settingManager) {- this.userManager = userManager;- this.groupManager = groupManager;- this.projectManager = projectManager;- this.sessionManager = sessionManager;- this.settingManager = settingManager;- }-- private AuthorizationInfo newAuthorizationInfo(Long userId) {- Collection<Permission> permissions =- sessionManager.call(new Callable<Collection<Permission>>() {-- @Override- public Collection<Permission> call() throws Exception {- Collection<Permission> permissions = new ArrayList<>();-- 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 (p instanceof ProjectPermission) {- ProjectPermission projectPermission = (ProjectPermission) p;- Project project = projectPermission.getProject();- Permission privilege = projectPermission.getPrivilege();- do {- if (project.getDefaultRole() != null && project.getDefaultRole().implies(privilege))- return true;- project = project.getParent();- } while (project != null);- }- return false;- }-- });- }- return permissions;- }-- });-- return new AuthorizationInfo() {-- private static final long serialVersionUID = 1L;-- @Override- public Collection<String> getStringPermissions() {- return new HashSet<>();- }-- @Override- public Collection<String> getRoles() {- return new HashSet<>();- }-- @Override- public Collection<Permission> getObjectPermissions() {- return permissions;- }-- };- }-- @Override- protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {- Long userId = (Long) principals.getPrimaryPrincipal();- RequestCycle requestCycle = RequestCycle.get();- if (requestCycle != null) {- Map<Long, AuthorizationInfo> authorizationInfos = requestCycle.getMetaData(AUTHORIZATION_INFOS);- if (authorizationInfos == null) {- authorizationInfos = new HashMap<>();- requestCycle.setMetaData(AUTHORIZATION_INFOS, authorizationInfos);- }- AuthorizationInfo authorizationInfo = authorizationInfos.get(userId);- if (authorizationInfo == null) {- authorizationInfo = newAuthorizationInfo(userId);- authorizationInfos.put(userId, authorizationInfo);- }- return authorizationInfo;- } else {- return newAuthorizationInfo(userId);- }- }-+package io.onedev.server.security.realm;++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;++import javax.inject.Inject;++import org.apache.shiro.authz.AuthorizationInfo;+import org.apache.shiro.authz.Permission;+import org.apache.shiro.realm.AuthorizingRealm;+import org.apache.shiro.subject.PrincipalCollection;+import org.apache.wicket.MetaDataKey;+import org.apache.wicket.request.cycle.RequestCycle;++import com.google.common.collect.Lists;++import io.onedev.server.entitymanager.GroupManager;+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 GroupManager groupManager;++ protected final ProjectManager projectManager;++ protected final SessionManager sessionManager;++ protected final SettingManager settingManager;++ @SuppressWarnings("serial")+ private static final MetaDataKey<Map<Long, AuthorizationInfo>> AUTHORIZATION_INFOS =+ new MetaDataKey<Map<Long, AuthorizationInfo>>() {};++ @Inject+ public AbstractAuthorizingRealm(UserManager userManager, GroupManager groupManager,+ ProjectManager projectManager, SessionManager sessionManager, SettingManager settingManager) {+ this.userManager = userManager;+ this.groupManager = groupManager;+ this.projectManager = projectManager;+ this.sessionManager = sessionManager;+ this.settingManager = settingManager;+ }++ private AuthorizationInfo newAuthorizationInfo(Long userId) {+ Collection<Permission> permissions = sessionManager.call(() -> {+ Collection<Permission> innerPermissions = new ArrayList<>();++ 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);+ innerPermissions.add(group);+ }++ innerPermissions.add(new UserAdministration(user));++ for (UserAuthorization authorization: user.getProjectAuthorizations())+ innerPermissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));+ for (IssueAuthorization authorization: user.getIssueAuthorizations()) {+ innerPermissions.add(new ProjectPermission(+ authorization.getIssue().getProject(),+ new ConfidentialIssuePermission(authorization.getIssue())));+ }+ }+ if (userId != 0L || settingManager.getSecuritySetting().isEnableAnonymousAccess()) {+ innerPermissions.add(p -> {+ if (p instanceof ProjectPermission) {+ ProjectPermission projectPermission = (ProjectPermission) p;+ Project project = projectPermission.getProject();+ Permission privilege = projectPermission.getPrivilege();+ do {+ if (project.getDefaultRole() != null && project.getDefaultRole().implies(privilege))+ return true;+ project = project.getParent();+ } while (project != null);+ }+ return false;+ });+ }+ return innerPermissions;+ });++ return new AuthorizationInfo() {++ private static final long serialVersionUID = 1L;++ @Override+ public Collection<String> getStringPermissions() {+ return new HashSet<>();+ }++ @Override+ public Collection<String> getRoles() {+ return new HashSet<>();+ }++ @Override+ public Collection<Permission> getObjectPermissions() {+ return permissions;+ }++ };+ }++ @Override+ protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {+ Long userId = (Long) principals.getPrimaryPrincipal();+ RequestCycle requestCycle = RequestCycle.get();+ if (requestCycle != null) {+ Map<Long, AuthorizationInfo> authorizationInfos = requestCycle.getMetaData(AUTHORIZATION_INFOS);+ if (authorizationInfos == null) {+ authorizationInfos = new HashMap<>();+ requestCycle.setMetaData(AUTHORIZATION_INFOS, authorizationInfos);+ }+ AuthorizationInfo authorizationInfo = authorizationInfos.get(userId);+ if (authorizationInfo == null) {+ authorizationInfo = newAuthorizationInfo(userId);+ authorizationInfos.put(userId, authorizationInfo);+ }+ return authorizationInfo;+ } else {+ return newAuthorizationInfo(userId);+ }+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/util/SearcherCallable.java b/server-core/src/main/java/io/onedev/server/util/SearcherCallable.javanew file mode 100644index 0000000000..178d62ad8d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/SearcherCallable.java@@ -0,0 +1,11 @@+package io.onedev.server.util;++import org.apache.lucene.search.IndexSearcher;++import java.io.IOException;++public interface SearcherCallable<T> {++ T call(IndexSearcher searcher) throws IOException;++}diff --git a/server-core/src/main/java/io/onedev/server/util/WriterRunnable.java b/server-core/src/main/java/io/onedev/server/util/WriterCallable.javasimilarity index 56%rename from server-core/src/main/java/io/onedev/server/util/WriterRunnable.javarename to server-core/src/main/java/io/onedev/server/util/WriterCallable.javaindex 9d80078ed7..d9e670ba74 100644--- a/server-core/src/main/java/io/onedev/server/util/WriterRunnable.java+++ b/server-core/src/main/java/io/onedev/server/util/WriterCallable.java@@ -4,8 +4,8 @@ import org.apache.lucene.index.IndexWriter;import java.io.IOException;-public interface WriterRunnable {+public interface WriterCallable<T> {- void run(IndexWriter writer) throws IOException;+ T call(IndexWriter writer) throws IOException;}diff --git a/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultBatchWorkManager.java b/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultBatchWorkManager.javaindex 97f6bcb08b..c7bfd99ba0 100644--- a/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultBatchWorkManager.java+++ b/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultBatchWorkManager.java@@ -1,22 +1,20 @@package io.onedev.server.util.concurrent;-import java.util.*;-import java.util.concurrent.BlockingQueue;-import java.util.concurrent.PriorityBlockingQueue;-import java.util.stream.Collectors;--import javax.inject.Inject;-import javax.inject.Singleton;-+import io.onedev.server.event.Listen;+import io.onedev.server.event.system.SystemStarted;+import io.onedev.server.event.system.SystemStopping;+import io.onedev.server.security.SecurityUtils;import org.apache.shiro.subject.Subject;import org.apache.shiro.util.ThreadContext;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.server.event.Listen;-import io.onedev.server.event.system.SystemStarted;-import io.onedev.server.event.system.SystemStopping;-import io.onedev.server.security.SecurityUtils;+import javax.inject.Inject;+import javax.inject.Singleton;+import java.util.*;+import java.util.concurrent.BlockingQueue;+import java.util.concurrent.PriorityBlockingQueue;+import java.util.stream.Collectors;@Singletonpublic class DefaultBatchWorkManager implements BatchWorkManager, Runnable {@@ -50,9 +48,32 @@ public class DefaultBatchWorkManager implements BatchWorkManager, Runnable {}@Listen- public synchronized void on(SystemStopping event) {- thread = null;- notify();+ public void on(SystemStopping event) {+ synchronized (this) {+ thread = null;+ notify();+ }+ while (true) {+ var hasWorkings = false;+ synchronized (this) {+ for (var worksOfWorker : works.values()) {+ if (!worksOfWorker.working.isEmpty()) {+ hasWorkings = true;+ break;+ }+ }+ }+ if (hasWorkings) {+ logger.info("Waiting for batch works to complete...");+ try {+ Thread.sleep(1000);+ } catch (InterruptedException e) {+ throw new RuntimeException(e);+ }+ } else {+ break;+ }+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.javaindex a0278dad88..7971bcce57 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java@@ -16,6 +16,7 @@ import java.util.stream.Collectors;import static io.onedev.server.util.match.WildcardUtils.matchPath;import static java.util.Comparator.comparing;+import static java.util.stream.Collectors.toSet;public class ProjectCache extends MapProxy<Long, ProjectFacade> implements Serializable {@@ -109,7 +110,7 @@ public class ProjectCache extends MapProxy<Long, ProjectFacade> implements Seriapublic Collection<Project> getProjects() {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- return keySet().stream().map(it->projectManager.load(it)).collect(Collectors.toSet());+ return keySet().stream().map(projectManager::load).collect(toSet());}public Comparator<Project> comparingPath() {diff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.javaindex 5ba7f5b1ac..6fd8bb164b 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java@@ -47,7 +47,6 @@ public class ProjectFacade extends EntityFacade {return name;}- @Nullablepublic String getPath() {return path;}diff --git a/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java b/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.javaindex 9fa9e34b16..a33459551f 100644--- a/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/lucene/LuceneUtils.java@@ -1,13 +1,25 @@package io.onedev.server.util.lucene;-import java.util.concurrent.atomic.AtomicBoolean;-+import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.util.WriterCallable;+import org.apache.lucene.analysis.Analyzer;+import org.apache.lucene.index.DirectoryReader;+import org.apache.lucene.index.IndexReader;+import org.apache.lucene.index.IndexWriter;+import org.apache.lucene.index.IndexWriterConfig;+import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.Query;import org.apache.lucene.search.QueryVisitor;+import org.apache.lucene.store.Directory;+import org.apache.lucene.store.FSDirectory;import org.bouncycastle.util.Arrays;import javax.annotation.Nullable;+import java.io.File;+import java.io.IOException;+import java.util.concurrent.atomic.AtomicBoolean;+import java.util.function.Function;public class LuceneUtils {@@ -47,5 +59,38 @@ public class LuceneUtils {});return !hasFields.get();}++ public static <T> T callWithSearcher(File indexDir, Function<IndexSearcher, T> func) {+ try (Directory directory = FSDirectory.open(indexDir.toPath())) {+ if (DirectoryReader.indexExists(directory)) {+ try (IndexReader reader = DirectoryReader.open(directory)) {+ return func.apply(new IndexSearcher(reader));+ }+ } else {+ return null;+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ public static <T> T callWithWriter(File indexDir, Analyzer analyzer, Function<IndexWriter, T> func) {+ try (Directory directory = FSDirectory.open(indexDir.toPath())) {+ IndexWriterConfig writerConfig = new IndexWriterConfig(analyzer);+ writerConfig.setOpenMode(IndexWriterConfig.OpenMode.CREATE_OR_APPEND);+ try (IndexWriter writer = new IndexWriter(directory, writerConfig)) {+ try {+ var result = func.apply(writer);+ writer.commit();+ return result;+ } catch (Exception e) {+ writer.rollback();+ throw ExceptionUtils.unchecked(e);+ }+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/util/match/WildcardUtils.java b/server-core/src/main/java/io/onedev/server/util/match/WildcardUtils.javaindex ba66e44e51..bdcd437502 100644--- a/server-core/src/main/java/io/onedev/server/util/match/WildcardUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/match/WildcardUtils.java@@ -25,7 +25,7 @@ public class WildcardUtils {** @param pattern* the pattern to match against. Must not be null- * @param str+ * @param path* the path to match, as a String. Must not be null** @return@@ -44,40 +44,40 @@ public class WildcardUtils {** @param pattern* the pattern to match against. Must not be null.- * @param str+ * @param string* the string which must be matched against the pattern. Must not be null.* @return* true if the string matches against the pattern, or false otherwise.*/- public static boolean matchString(String pattern, String str) {- return STRING_MATCHER.matches(pattern, str);+ public static boolean matchString(String pattern, String string) {+ return STRING_MATCHER.matches(pattern, string);}- private static int indexOf(String str, String substr, int index) {- if (index >= str.length()) {- return (substr.length() == 0 ? str.length(): -1);+ private static int indexOf(String string, String substring, int index) {+ if (index >= string.length()) {+ return (substring.length() == 0 ? string.length(): -1);}if (index < 0) {index = 0;}- if (substr.length() == 0) {+ if (substring.length() == 0) {return index;}- char first = substr.charAt(0);- int max = (str.length() - substr.length());+ char first = substring.charAt(0);+ int max = (string.length() - substring.length());for (int i = index; i <= max; i++) {/* Look for first character. */- if ('?' != first && str.charAt(i) != first) {- while (++i <= max && '?' != first && str.charAt(i) != first);+ if ('?' != first && string.charAt(i) != first) {+ while (++i <= max && '?' != first && string.charAt(i) != first);}/* Found first character, now look at the rest of v2 */if (i <= max) {int j = i + 1;- int end = j + substr.length() - 1;- for (int k = 1; j < end && ('?' == substr.charAt(k) || str.charAt(j) == substr.charAt(k)); j++, k++);+ int end = j + substring.length() - 1;+ for (int k = 1; j < end && ('?' == substring.charAt(k) || string.charAt(j) == substring.charAt(k)); j++, k++);if (j == end) {/* Found whole string. */@@ -292,14 +292,14 @@ public class WildcardUtils {}@Nullable- public static LinearRange rangeOfMatch(String pattern, String str) {+ public static LinearRange rangeOfMatch(String pattern, String string) {List<LinearRange> literalRanges = getLiteralRanges(pattern);int first = -1;int pos = 0;for (LinearRange literalRange: literalRanges) {String literal = pattern.substring(literalRange.getFrom(), literalRange.getTo());- int index = indexOf(str, literal, pos);+ int index = indexOf(string, literal, pos);if (index != -1) {if (first == -1)first = index;diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.javaindex 7e1b4e2a84..4c6dd2c486 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/RevisionAndPathParam.java@@ -42,8 +42,6 @@ public class RevisionAndPathParam extends ParamSegment {}} catch (TooGeneralQueryException e) {suggestions.put("Query is too general", null);- } catch (InterruptedException e) {- throw new RuntimeException(e);}}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java b/server-core/src/main/java/io/onedev/server/web/component/project/ProjectAvatar.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.javarename to server-core/src/main/java/io/onedev/server/web/component/project/ProjectAvatar.javaindex 3007051212..730492a059 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/ProjectAvatar.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.project.avatar;+package io.onedev.server.web.component.project;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.WebComponent;diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.javadeleted file mode 100644index f7c3230686..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java+++ /dev/null@@ -1,62 +0,0 @@-package io.onedev.server.web.component.project.avatar;--import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.model.Project;-import io.onedev.server.web.avatar.AvatarManager;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;--@SuppressWarnings("serial")-public class ProjectAvatarLink extends ViewStateAwarePageLink<Void> {-- private final PageParameters params;-- private String url;-- private String tooltip;-- public ProjectAvatarLink(String id, Project project) {- super(id, ProjectBlobPage.class);-- AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);- params = ProjectPage.paramsOf(project);- url = avatarManager.getProjectAvatarUrl(project.getId());- tooltip = project.getPath();- }-- @Override- public PageParameters getPageParameters() {- return params;- }-- @Override- public IModel<?> getBody() {- return Model.of("<img src='" + url + "' class='avatar'></img>");- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- configure();- if (!isEnabled())- tag.setName("span");- tag.put("title", tooltip);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- setEnabled(!params.isEmpty());- setEscapeModelStrings(false);-- setOutputMarkupId(true);- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.javaindex 1708932615..1a14e6e439 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.java@@ -5,7 +5,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.web.component.project.avatar.ProjectAvatar;+import io.onedev.server.web.component.project.ProjectAvatar;@SuppressWarnings("serial")abstract class ChildLinkPanel extends Panel {diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.javaindex 2f88d3002f..ac42feaf64 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java@@ -128,7 +128,8 @@ public abstract class ProjectInfoPanel extends Panel {};var activeServer = getProject().getActiveServer(false);- forkNow.setVisible(SecurityUtils.canReadCode(getProject())+ forkNow.setVisible(SecurityUtils.getUser() != null+ && SecurityUtils.canReadCode(getProject())&& activeServer != null);forkInfo.add(forkNow);diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 6bf5f157e4..9a9de36efe 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@@ -92,7 +92,7 @@ import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;import io.onedev.server.web.component.orderedit.OrderEditPanel;-import io.onedev.server.web.component.project.avatar.ProjectAvatar;+import io.onedev.server.web.component.project.ProjectAvatar;import io.onedev.server.web.component.project.childrentree.ProjectChildrenTree;import io.onedev.server.web.component.project.selector.ProjectSelector;import io.onedev.server.web.component.project.stats.build.BuildStatsPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.javaindex c9bc2804d4..d9b3126c42 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@@ -33,7 +33,7 @@ import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReferenceimport 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.component.project.ProjectAvatar;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex d6939cca9b..e5f1db660a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -152,13 +152,9 @@ public abstract class SymbolTooltipPanel extends Panel {.caseSensitive(true).count(maxQueryEntries).build();- try {- CodeSearchManager searchManager = OneDev.getInstance(CodeSearchManager.class);- ObjectId commit = getProject().getRevCommit(revision, true);- hits = searchManager.search(getProject(), commit, query);- } catch (InterruptedException e) {- throw new RuntimeException(e);- }+ CodeSearchManager searchManager = OneDev.getInstance(CodeSearchManager.class);+ ObjectId commit = getProject().getRevCommit(revision, true);+ hits = searchManager.search(getProject(), commit, query);} else {hits = new ArrayList<>();}@@ -232,33 +228,29 @@ public abstract class SymbolTooltipPanel extends Panel {if (symbolHits.size() < QUERY_ENTRIES) {// then find in other files for public symbols- try {- CodeSearchManager searchManager = OneDev.getInstance(CodeSearchManager.class);- ObjectId commit = getProject().getRevCommit(revision, true);- BlobQuery query;- if (symbolHits.size() < QUERY_ENTRIES) {- query = new SymbolQuery.Builder(symbolName)- .caseSensitive(true)- .excludeBlobPath(blobIdent.path)- .primary(true)- .local(false)- .count(QUERY_ENTRIES)- .build();- symbolHits.addAll(searchManager.search(getProject(), commit, query));- }- if (symbolHits.size() < QUERY_ENTRIES) {- query = new SymbolQuery.Builder(symbolName)- .caseSensitive(true)- .excludeBlobPath(blobIdent.path)- .primary(false)- .local(false)- .count(QUERY_ENTRIES - symbolHits.size())- .build();- symbolHits.addAll(searchManager.search(getProject(), commit, query));- }- } catch (InterruptedException e) {- throw new RuntimeException(e);- }+ CodeSearchManager searchManager = OneDev.getInstance(CodeSearchManager.class);+ ObjectId commit = getProject().getRevCommit(revision, true);+ BlobQuery query;+ if (symbolHits.size() < QUERY_ENTRIES) {+ query = new SymbolQuery.Builder(symbolName)+ .caseSensitive(true)+ .excludeBlobPath(blobIdent.path)+ .primary(true)+ .local(false)+ .count(QUERY_ENTRIES)+ .build();+ symbolHits.addAll(searchManager.search(getProject(), commit, query));+ }+ if (symbolHits.size() < QUERY_ENTRIES) {+ query = new SymbolQuery.Builder(symbolName)+ .caseSensitive(true)+ .excludeBlobPath(blobIdent.path)+ .primary(false)+ .local(false)+ .count(QUERY_ENTRIES - symbolHits.size())+ .build();+ symbolHits.addAll(searchManager.search(getProject(), commit, query));+ }}}target.add(content);@@ -287,7 +279,7 @@ public abstract class SymbolTooltipPanel extends Panel {public PageParameters getQueryHitParams(QueryHit hit) {BlobIdent blobIdent = new BlobIdent(revision, hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);- state.position = BlobRenderer.getSourcePosition(hit.getTokenPos());+ state.position = BlobRenderer.getSourcePosition(hit.getHitPos());return ProjectBlobPage.paramsOf(getProject(), state);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex ab44c50438..177e06523b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -16,7 +16,7 @@ import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.project.avatar.ProjectAvatar;+import io.onedev.server.web.component.project.ProjectAvatar;import io.onedev.server.web.component.project.childrentree.ProjectChildrenTree;import io.onedev.server.web.component.project.info.ProjectInfoPanel;import io.onedev.server.web.editable.EditableUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex abc79cea0a..e0f0f10dd9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -277,13 +277,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,.caseSensitive(true).count(maxQueryEntries).build();- try {- CodeSearchManager searchManager = OneDev.getInstance(CodeSearchManager.class);- queryHits = searchManager.search(projectModel.getObject(), getProject().getRevCommit(resolvedRevision, true),- query);- } catch (InterruptedException e) {- throw new RuntimeException(e);- }+ CodeSearchManager searchManager = OneDev.getInstance(CodeSearchManager.class);+ queryHits = searchManager.search(projectModel.getObject(),+ getProject().getRevCommit(resolvedRevision, true), query);} else {queryHits = null;}@@ -665,7 +661,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,protected void onSelect(AjaxRequestTarget target, QueryHit hit) {BlobIdent selected = new BlobIdent(state.blobIdent.revision, hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());- ProjectBlobPage.this.onSelect(target, selected, BlobRenderer.getSourcePosition(hit.getTokenPos()));+ ProjectBlobPage.this.onSelect(target, selected, BlobRenderer.getSourcePosition(hit.getHitPos()));modal.close();}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.javaindex 39aec49596..254c332793 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@@ -833,7 +833,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searprotected void onSelect(AjaxRequestTarget target, QueryHit hit) {BlobIdent blobIdent = new BlobIdent(getRevision(), hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());- context.onSelect(target, blobIdent, BlobRenderer.getSourcePosition(hit.getTokenPos()));+ context.onSelect(target, blobIdent, BlobRenderer.getSourcePosition(hit.getHitPos()));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.javaindex bec4b1c490..9fd60cb3d8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java@@ -189,43 +189,39 @@ public abstract class AdvancedSearchPanel extends Panel {var revision = revisionModel.getObject();var count = getMaxQueryEntries();if (revision != null) {- try {- var directory = getDirectory(insideCurrentDir);- var searchManager = OneDev.getInstance(CodeSearchManager.class);- if (option instanceof TextQueryOption) {- var query = new TextQuery.Builder((TextQueryOption) option)- .directory(directory)- .count(count)- .build();- ObjectId commit = project.getRevCommit(revision, true);- hits = searchManager.search(project, commit, query);- } else if (option instanceof FileQueryOption) {- var query = new FileQuery.Builder((FileQueryOption) option)- .directory(directory)- .count(count)- .build();- ObjectId commit = project.getRevCommit(revision, true);- hits = searchManager.search(project, commit, query);- } else {- var query = new SymbolQuery.Builder((SymbolQueryOption) option)- .primary(true)+ var directory = getDirectory(insideCurrentDir);+ var searchManager = OneDev.getInstance(CodeSearchManager.class);+ if (option instanceof TextQueryOption) {+ var query = new TextQuery.Builder((TextQueryOption) option)+ .directory(directory)+ .count(count)+ .build();+ ObjectId commit = project.getRevCommit(revision, true);+ hits = searchManager.search(project, commit, query);+ } else if (option instanceof FileQueryOption) {+ var query = new FileQuery.Builder((FileQueryOption) option)+ .directory(directory)+ .count(count)+ .build();+ ObjectId commit = project.getRevCommit(revision, true);+ hits = searchManager.search(project, commit, query);+ } else {+ var query = new SymbolQuery.Builder((SymbolQueryOption) option)+ .primary(true)+ .directory(directory)+ .count(count)+ .build();+ ObjectId commit = project.getRevCommit(revision, true);+ hits = searchManager.search(project, commit, query);++ if (hits.size() < count) {+ query = new SymbolQuery.Builder((SymbolQueryOption) option)+ .primary(false).directory(directory)- .count(count)+ .count(count-hits.size()).build();- ObjectId commit = project.getRevCommit(revision, true);- hits = searchManager.search(project, commit, query);-- if (hits.size() < count) {- query = new SymbolQuery.Builder((SymbolQueryOption) option)- .primary(false)- .directory(directory)- .count(count-hits.size())- .build();- hits.addAll(searchManager.search(project, commit, query));- }+ hits.addAll(searchManager.search(project, commit, query));}- } catch (InterruptedException e) {- throw new RuntimeException(e);}} else {hits = new ArrayList<>();@@ -308,7 +304,7 @@ public abstract class AdvancedSearchPanel extends Panel {protected String getDirectory(boolean insideDir) {BlobIdent blobIdent = getCurrentBlob();- if (blobIdent == null || blobIdent.path == null || !blobIdent.path.contains("/") || !insideDir)+ if (blobIdent == null || blobIdent.path == null || !insideDir)return null;else if (blobIdent.isTree())return blobIdent.path;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.javaindex 65cca11502..ad1223e060 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java@@ -253,7 +253,7 @@ public abstract class QuickSearchPanel extends Panel {BlobIdent blobIdent = new BlobIdent(revisionModel.getObject(), hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);- state.position = BlobRenderer.getSourcePosition(hit.getTokenPos());+ state.position = BlobRenderer.getSourcePosition(hit.getHitPos());PageParameters params = ProjectBlobPage.paramsOf(projectModel.getObject(), state);CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, params);link.add(AttributeAppender.replace("href", url.toString()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.javaindex 63a5c853fd..f1c2c99cfc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java@@ -102,13 +102,13 @@ public abstract class SearchResultPanel extends Panel {@Overridepublic int compare(QueryHit o1, QueryHit o2) {- if (o1.getTokenPos() != null) {- if (o2.getTokenPos() != null)- return o1.getTokenPos().getFromRow() - o2.getTokenPos().getFromRow();+ if (o1.getHitPos() != null) {+ if (o2.getHitPos() != null)+ return o1.getHitPos().getFromRow() - o2.getHitPos().getFromRow();elsereturn -1;} else {- if (o2.getTokenPos() != null)+ if (o2.getHitPos() != null)return 1;elsereturn 0;@@ -156,7 +156,7 @@ public abstract class SearchResultPanel extends Panel {BlobIdent selected = new BlobIdent(context.getBlobIdent().revision, hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());- context.onSelect(target, selected, BlobRenderer.getSourcePosition(hit.getTokenPos()));+ context.onSelect(target, selected, BlobRenderer.getSourcePosition(hit.getHitPos()));}private String getActiveBlobPath(ActiveIndex activeIndex) {@@ -170,7 +170,7 @@ public abstract class SearchResultPanel extends Panel {private PlanarRange getActiveBlobMark(ActiveIndex activeIndex) {MatchedBlob activeBlob = blobs.get(activeIndex.blob);if (activeIndex.hit != -1)- return activeBlob.getHits().get(activeIndex.hit).getTokenPos();+ return activeBlob.getHits().get(activeIndex.hit).getHitPos();elsereturn null;}@@ -532,8 +532,8 @@ public abstract class SearchResultPanel extends Panel {super.onInitialize();add(hit.renderIcon("icon"));- if (hit.getTokenPos() != null)- add(new Label("lineNo", String.valueOf(hit.getTokenPos().getFromRow()+1) + ":"));+ if (hit.getHitPos() != null)+ add(new Label("lineNo", String.valueOf(hit.getHitPos().getFromRow()+1) + ":"));elseadd(new Label("lineNo").setVisible(false));add(hit.render("label"));@@ -546,7 +546,7 @@ public abstract class SearchResultPanel extends Panel {BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);- state.position = BlobRenderer.getSourcePosition(hit.getTokenPos());+ state.position = BlobRenderer.getSourcePosition(hit.getHitPos());PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, params);add(AttributeAppender.replace("href", url.toString()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.javaindex 5670ea4853..476e88bddb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java@@ -14,7 +14,7 @@ import io.onedev.server.OneDev;import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.component.avatarupload.AvatarFileSelected;import io.onedev.server.web.component.avatarupload.AvatarUploadField;-import io.onedev.server.web.component.project.avatar.ProjectAvatar;+import io.onedev.server.web.component.project.ProjectAvatar;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")diff --git a/server-core/src/test/java/io/onedev/server/util/match/WildcardUtilsTest.java b/server-core/src/test/java/io/onedev/server/util/match/WildcardUtilsTest.javaindex 8c0dd79b1f..84ba4729dd 100644--- a/server-core/src/test/java/io/onedev/server/util/match/WildcardUtilsTest.java+++ b/server-core/src/test/java/io/onedev/server/util/match/WildcardUtilsTest.java@@ -50,6 +50,7 @@ public class WildcardUtilsTest {assertEquals("hello:0-0", applyStringPattern("", "hello", false).toString());assertEquals("*:0-1", applyStringPattern("*", "hello", false).toString());assertEquals("**:0-2", applyStringPattern("**", "hello", false).toString());+ assertEquals("he*:0-3", applyStringPattern("he*", "hello", false).toString());}@Testdiff --git a/server-ee/pom.xml b/server-ee/pom.xmlnew file mode 100644index 0000000000..4acc486d83--- /dev/null+++ b/server-ee/pom.xml@@ -0,0 +1,20 @@+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">+ <modelVersion>4.0.0</modelVersion>+ <artifactId>server-ee</artifactId>+ <parent>+ <groupId>io.onedev</groupId>+ <artifactId>server</artifactId>+ <version>8.2.5</version>+ </parent>+ <dependencies>+ <dependency>+ <groupId>io.onedev</groupId>+ <artifactId>server-core</artifactId>+ <version>${project.version}</version>+ </dependency>+ </dependencies>+ <properties>+ <moduleClass>io.onedev.server.ee.EEModule</moduleClass>+ </properties>+</project>diff --git a/server-ee/src/main/java/io/onedev/server/ee/EEMainMenuCustomization.java b/server-ee/src/main/java/io/onedev/server/ee/EEMainMenuCustomization.javanew file mode 100644index 0000000000..f11f152228--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/EEMainMenuCustomization.java@@ -0,0 +1,43 @@+package io.onedev.server.ee;++import io.onedev.server.ee.dashboard.DashboardPage;+import io.onedev.server.ee.xsearch.FileSearchPage;+import io.onedev.server.ee.xsearch.SymbolSearchPage;+import io.onedev.server.ee.xsearch.TextSearchPage;+import io.onedev.server.web.page.layout.DefaultMainMenuCustomization;+import io.onedev.server.web.page.layout.SidebarMenuItem;+import org.apache.wicket.core.request.handler.PageProvider;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import javax.inject.Singleton;+import java.util.ArrayList;+import java.util.List;++@Singleton+public class EEMainMenuCustomization extends DefaultMainMenuCustomization {++ private static final long serialVersionUID = 1L;++ @Override+ public PageProvider getHomePage(boolean failsafe) {+ return new PageProvider(DashboardPage.class, DashboardPage.paramsOf(null, failsafe));+ }++ @Override+ public List<SidebarMenuItem> getMainMenuItems() {+ var menuItems = new ArrayList<SidebarMenuItem>();++ menuItems.add(new SidebarMenuItem.Page("dashboard", "Dashboards", DashboardPage.class,+ new PageParameters()));+ menuItems.addAll(super.getMainMenuItems());++ var codeSearchMenuItems = new ArrayList<SidebarMenuItem>();+ codeSearchMenuItems.add(new SidebarMenuItem.Page(null, "Text", TextSearchPage.class, new PageParameters()));+ codeSearchMenuItems.add(new SidebarMenuItem.Page(null, "Files", FileSearchPage.class, new PageParameters()));+ codeSearchMenuItems.add(new SidebarMenuItem.Page(null, "Symbols", SymbolSearchPage.class, new PageParameters()));+ menuItems.add(new SidebarMenuItem.SubMenu("code", "Code Search", codeSearchMenuItems));++ return menuItems;+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/EEModule.java b/server-ee/src/main/java/io/onedev/server/ee/EEModule.javanew file mode 100644index 0000000000..a7b743b346--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/EEModule.java@@ -0,0 +1,74 @@+package io.onedev.server.ee;++import io.onedev.commons.loader.AbstractPluginModule;+import io.onedev.commons.loader.ImplementationProvider;+import io.onedev.commons.utils.ClassUtils;+import io.onedev.server.cluster.ClusterManager;+import io.onedev.server.ee.clustering.EEClusterManager;+import io.onedev.server.ee.dashboard.DashboardPage;+import io.onedev.server.ee.dashboard.widgets.WidgetGroup;+import io.onedev.server.ee.storage.EEStorageManager;+import io.onedev.server.ee.storage.StorageSetting;+import io.onedev.server.ee.terminal.BuildTerminalPage;+import io.onedev.server.ee.terminal.EETerminalManager;+import io.onedev.server.ee.xsearch.*;+import io.onedev.server.model.support.Widget;+import io.onedev.server.storage.StorageManager;+import io.onedev.server.terminal.TerminalManager;+import io.onedev.server.web.WebApplicationConfigurator;+import io.onedev.server.web.mapper.BasePageMapper;+import io.onedev.server.web.page.layout.AdministrationSettingContribution;+import io.onedev.server.web.page.layout.MainMenuCustomization;++import java.util.Collection;+import java.util.HashSet;++import static com.beust.jcommander.internal.Lists.newArrayList;++/**+ * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.+ *+ */+public class EEModule extends AbstractPluginModule {++ @Override+ protected void configure() {+ super.configure();++ bind(TerminalManager.class).to(EETerminalManager.class);+ bind(ClusterManager.class).to(EEClusterManager.class);+ bind(StorageManager.class).to(EEStorageManager.class);+ bind(CodeSearchManager.class).to(DefaultCodeSearchManager.class);+ bind(CodeIndexManager.class).to(DefaultCodeIndexManager.class);++ bind(MainMenuCustomization.class).to(EEMainMenuCustomization.class);+ contribute(ImplementationProvider.class, new ImplementationProvider() {++ @Override+ public Collection<Class<?>> getImplementations() {+ Collection<Class<?>> implementations = new HashSet<>();+ for (Class<?> implementation: ClassUtils.findImplementations(Widget.class, WidgetGroup.class))+ implementations.add(implementation);+ return implementations;+ }++ @Override+ public Class<?> getAbstractClass() {+ return Widget.class;+ }++ });++ contribute(WebApplicationConfigurator.class, application -> {+ application.mount(new BasePageMapper("dashboards", DashboardPage.class));+ application.mount(new BasePageMapper("dashboards/${dashboard}", DashboardPage.class));+ application.mount(new BasePageMapper("projects/${project}/builds/${build}/terminal", BuildTerminalPage.class));+ application.mount(new BasePageMapper("~code-search/text", TextSearchPage.class));+ application.mount(new BasePageMapper("~code-search/symbols", SymbolSearchPage.class));+ application.mount(new BasePageMapper("~code-search/files", FileSearchPage.class));+ });++ contribute(AdministrationSettingContribution.class, () -> newArrayList(StorageSetting.class));+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/clustering/EEClusterManager.java b/server-ee/src/main/java/io/onedev/server/ee/clustering/EEClusterManager.javanew file mode 100644index 0000000000..171064abc6--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/clustering/EEClusterManager.java@@ -0,0 +1,251 @@+package io.onedev.server.ee.clustering;++import io.onedev.server.ServerConfig;+import io.onedev.server.cluster.DefaultClusterManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.event.ListenerRegistry;+import io.onedev.server.persistence.PersistenceManager;+import io.onedev.server.persistence.HibernateConfig;+import io.onedev.server.replica.ProjectReplica;++import javax.inject.Inject;+import javax.inject.Singleton;+import java.util.*;++import static io.onedev.server.replica.ProjectReplica.Type.*;+import static java.util.Collections.reverse;+import static java.util.Comparator.comparing;+import static java.util.Comparator.comparingInt;+import static java.util.stream.Collectors.toList;++@Singleton+public class EEClusterManager extends DefaultClusterManager {++ private final SettingManager settingManager;++ @Inject+ public EEClusterManager(ServerConfig serverConfig, PersistenceManager persistenceManager,+ SettingManager settingManager, ListenerRegistry listenerRegistry,+ HibernateConfig hibernateConfig) {+ super(serverConfig, persistenceManager, listenerRegistry, hibernateConfig);+ this.settingManager = settingManager;+ }++ @Override+ public void redistributeProjects(Map<Long, LinkedHashMap<String, ProjectReplica>> replicas) {+ var servers = new LinkedHashSet<>(getServerAddresses());+ var replicaCount = settingManager.getClusterSetting().getReplicaCount();+ // Normalize distributions+ for (var entry: replicas.values()) {+ var replicasOfProject = entry.entrySet().stream()+ .filter(it -> servers.contains(it.getKey()))+ .map(Map.Entry::getValue)+ .sorted(comparing(ProjectReplica::getVersion))+ .collect(toList());+ reverse(replicasOfProject);+ var primaryFound = false;+ for (var replica : replicasOfProject) {+ if (replica.getType() == PRIMARY) {+ if (primaryFound)+ replica.setType(BACKUP);+ else+ primaryFound = true;+ }+ }+ if (!primaryFound) {+ if (!replicasOfProject.isEmpty()) {+ replicasOfProject.iterator().next().setType(PRIMARY);+ } else {+ var replica = new ProjectReplica();+ replica.setType(PRIMARY);+ replica.setVersion(0);+ replicasOfProject.add(replica);+ entry.put(servers.iterator().next(), replica);+ }+ }+ int backupCount = 0;+ for (var replica : replicasOfProject) {+ if (replica.getType() == BACKUP && ++backupCount > replicaCount - 1)+ replica.setType(REDUNDANT);+ }+ if (backupCount < replicaCount - 1) {+ for (var replica : replicasOfProject) {+ if (replica.getType() == REDUNDANT) {+ replica.setType(BACKUP);+ backupCount++;+ if (backupCount == replicaCount - 1)+ break;+ }+ }+ }+ for (int i = 0; i < replicaCount - 1 - backupCount; i++) {+ for (var server : servers) {+ if (!entry.containsKey(server)) {+ ProjectReplica replica = new ProjectReplica();+ replica.setType(BACKUP);+ replica.setVersion(0);+ replicasOfProject.add(replica);+ entry.put(server, replica);+ break;+ }+ }+ }+ }++ // Now distribute all replicas across all servers evenly+ Map<String, Integer> serverLoads = getServerLoads(replicas, servers, EnumSet.of(PRIMARY, BACKUP));++ Map<String, Map<Long, ProjectReplica>> serverReplicas = new LinkedHashMap<>();+ for (var projectToReplicas: replicas.entrySet()) {+ var projectId = projectToReplicas.getKey();+ for (var serverToReplica: projectToReplicas.getValue().entrySet()) {+ var server = serverToReplica.getKey();+ if (servers.contains(server)) {+ var replica = serverToReplica.getValue();+ if (replica.getType() != REDUNDANT)+ serverReplicas.computeIfAbsent(server, k -> new LinkedHashMap<>()).put(projectId, replica);+ }+ }+ }+ servers.forEach(it->serverReplicas.putIfAbsent(it, new LinkedHashMap<>()));++ while (true) {+ String minLoadServer = null, maxLoadServer = null;+ int minServerLoad = replicas.size() + 1, maxServerLoad = -1;+ for (var entry : serverLoads.entrySet()) {+ if (entry.getValue() > maxServerLoad) {+ maxLoadServer = entry.getKey();+ maxServerLoad = entry.getValue();+ }+ if (entry.getValue() < minServerLoad) {+ minLoadServer = entry.getKey();+ minServerLoad = entry.getValue();+ }+ }+ if (maxServerLoad - minServerLoad >= 2) {+ var replicasOnMaxLoadServer = serverReplicas.get(maxLoadServer);+ var replicasOnMinLoadServer = serverReplicas.get(minLoadServer);+ var moveLoad = (maxServerLoad - minServerLoad) / 2;+ for (var i = 0; i < moveLoad; i++) {+ for (var it = replicasOnMaxLoadServer.entrySet().iterator(); it.hasNext();) {+ var entry = it.next();+ var projectId = entry.getKey();+ var replica = entry.getValue();+ if (!replicasOnMinLoadServer.containsKey(projectId)) {+ var replicasOfProject = replicas.get(projectId);+ var prevReplica = replicasOfProject.get(minLoadServer);+ if (prevReplica != null) {+ prevReplica.setType(replica.getType());+ replicasOnMinLoadServer.put(projectId, prevReplica);+ } else {+ var newReplica = new ProjectReplica();+ newReplica.setType(replica.getType());+ newReplica.setVersion(0);+ replicasOfProject.put(minLoadServer, newReplica);+ replicasOnMinLoadServer.put(projectId, newReplica);+ }+ replica.setType(REDUNDANT);+ it.remove();+ break;+ }+ }+ }+ serverLoads.put(maxLoadServer, maxServerLoad - moveLoad);+ serverLoads.put(minLoadServer, minServerLoad + moveLoad);+ } else {+ break;+ }+ }++ // Now distribute primary replicas across servers evenly (best try)+ serverLoads = getServerLoads(replicas, servers, EnumSet.of(PRIMARY));++ for (var replicasOfProject: replicas.values()) {+ var primaryServerLoad = -1;+ Map.Entry<String, ProjectReplica> primaryEntry = null;+ for (var serverToReplica: replicasOfProject.entrySet()) {+ var server = serverToReplica.getKey();+ if (servers.contains(server) && serverToReplica.getValue().getType() == PRIMARY) {+ primaryEntry = serverToReplica;+ primaryServerLoad = serverLoads.get(server);+ break;+ }+ }++ var minBackupServerLoad = replicas.size();+ Map.Entry<String, ProjectReplica> minBackupEntry = null;+ for (var serverToReplica: replicasOfProject.entrySet()) {+ var server = serverToReplica.getKey();+ var replica = serverToReplica.getValue();+ if (servers.contains(server) && replica.getType() == BACKUP) {+ var serverLoad = serverLoads.get(server);+ if (serverLoad < minBackupServerLoad) {+ minBackupServerLoad = serverLoad;+ minBackupEntry = serverToReplica;+ }+ }+ }++ if (primaryServerLoad - minBackupServerLoad >= 2) {+ primaryEntry.getValue().setType(BACKUP);+ minBackupEntry.getValue().setType(PRIMARY);+ serverLoads.put(primaryEntry.getKey(), primaryServerLoad - 1);+ serverLoads.put(minBackupEntry.getKey(), minBackupServerLoad + 1);+ }+ }+ }++ private Map<String, Integer> getServerLoads(Map<Long, LinkedHashMap<String, ProjectReplica>> replicas,+ Collection<String> servers, Set<ProjectReplica.Type> replicaTypes) {+ Map<String, Integer> serverLoads = new LinkedHashMap<>();+ for (var replicasOfProject: replicas.values()) {+ for (var serverToReplica: replicasOfProject.entrySet()) {+ var server = serverToReplica.getKey();+ if (servers.contains(server)) {+ var replica = serverToReplica.getValue();+ if (replicaTypes.contains(replica.getType())) {+ Integer serverLoad = serverLoads.get(server);+ if (serverLoad == null)+ serverLoad = 0;+ serverLoads.put(server, ++serverLoad);+ }+ }+ }+ }+ servers.forEach(it->serverLoads.putIfAbsent(it, 0));+ return serverLoads;+ }++ @Override+ public LinkedHashMap<String, ProjectReplica> addProject(Map<Long, LinkedHashMap<String, ProjectReplica>> replicas, Long projectId) {+ var servers = new HashSet<>(getServerAddresses());+ var replicaCount = settingManager.getClusterSetting().getReplicaCount();++ var serverLoads = getServerLoads(replicas, servers, EnumSet.of(PRIMARY, BACKUP));+ var sortedServers = new ArrayList<>(servers);+ sortedServers.sort(comparingInt(serverLoads::get));++ LinkedHashMap<String, ProjectReplica> replicasOfNewProject = new LinkedHashMap<>();+ for (var server: sortedServers) {+ var replica = new ProjectReplica();+ replica.setType(BACKUP);+ replica.setVersion(0);+ replicasOfNewProject.put(server, replica);+ if (replicasOfNewProject.size() >= replicaCount)+ break;+ }++ serverLoads = getServerLoads(replicas, servers, EnumSet.of(PRIMARY));+ sortedServers = new ArrayList<>(replicasOfNewProject.keySet());+ var primaryServer = sortedServers.stream().min(comparing(serverLoads::get)).get();+ replicasOfNewProject.get(primaryServer).setType(PRIMARY);++ return replicasOfNewProject;+ }++ @Override+ public boolean isClusteringSupported() {+ return true;+ }++}\ No newline at end of filediff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/DashboardPage.html b/server-ee/src/main/java/io/onedev/server/ee/dashboard/DashboardPage.htmlnew file mode 100644index 0000000000..fb8bbbf81b--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/DashboardPage.html@@ -0,0 +1,56 @@+<wicket:extend>+ <div wicket:id="content" class="dashboard flex-grow-1 fit-content d-flex flex-column"></div>+ <wicket:fragment wicket:id="dashboardSelectorFrag">+ <ul class="list-unstyled mb-0 py-2">+ <li wicket:id="dashboards" class="selectable">+ <a wicket:id="link">+ <div class="d-flex align-items-center">+ <svg wicket:id="icon" class="icon icon-sm mr-2"></svg><span wicket:id="label" class="text-nowrap"></span>+ </div>+ <div wicket:id="note" class="font-size-sm text-muted ml-4"></div>+ </a>+ </li>+ </ul>+ </wicket:fragment>+ <wicket:fragment wicket:id="dashboardViewFrag">+ <div class="head border-bottom d-flex align-items-center flex-shrink-0">+ <a wicket:id="dashboardSelector" class="dashboard-selector mr-2">+ <span wicket:id="name"></span>+ <wicket:svg href="arrow" class="icon rotate-90"/>+ </a>+ <span wicket:id="dashboardNote" class="font-size-sm text-muted d-none d-md-inline mr-2"></span>+ <span class="operations ml-auto">+ <a wicket:id="editDashboard" class="btn btn-xs btn-icon btn-light btn-hover-primary ml-2" title="Edit dashboard"><wicket:svg href="edit" class="icon"/></a>+ <a wicket:id="copyDashboard" class="btn btn-xs btn-icon btn-light btn-hover-primary ml-2" title="Copy dashboard"><wicket:svg href="copy" class="icon"/></a>+ <a wicket:id="shareDashboard" class="btn btn-xs btn-icon btn-light btn-hover-primary ml-2" title="Share dashboard"><wicket:svg href="share" class="icon"/></a>+ <a wicket:id="deleteDashboard" class="btn btn-xs btn-icon btn-light btn-hover-danger ml-2" title="Delete dashboard"><wicket:svg href="trash" class="icon"/></a>+ <a wicket:id="addDashboard" class="btn btn-xs btn-icon btn-light btn-hover-primary ml-2" title="Add dashboard"><wicket:svg href="plus" class="icon"/></a>+ </span>+ </div>+ <div class="body autofit flex-grow-1">+ <div class="content resize-aware position-relative flex-grow-1 d-flex flex-column">+ <div class="grid flex-grow-1"></div>+ <div wicket:id="widgets" class="widget shadow d-flex flex-column"></div>+ </div>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="dashboardEditFrag">+ <div class="head border-bottom flex-shrink-0">+ <form wicket:id="form" class="leave-confirm">+ <div class="d-flex align-items-center">+ <input wicket:id="name" placeholder="Dashboard name" class="form-control-sm form-control w-auto">+ <a wicket:id="addWidget" class="btn btn-sm btn-light btn-hover-primary mx-4">Add Widget <wicket:svg href="arrow" class="icon rotate-90 ml-1"/></a>+ <button wicket:id="save" type="submit" class="btn btn-sm btn-primary dirty-aware mr-2">Save</button>+ <a wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</a>+ </div>+ <div wicket:id="feedback" class="mt-2"></div>+ </form>+ </div>+ <div class="body autofit flex-grow-1 d-flex flex-column">+ <div class="content m-2 m-sm-5 resize-aware position-relative flex-grow-1 d-flex flex-column" ondragover="onedev.server.dashboard.onDragOver(event)" ondrop="onedev.server.dashboard.onDrop(event)">+ <svg class="grid d-block flex-grow-1"></svg>+ <div wicket:id="widgets" class="widget shadow d-flex flex-column" draggable="true" ondragstart="onedev.server.dashboard.onDragStart(event)"></div>+ </div>+ </div>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/DashboardPage.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/DashboardPage.javanew file mode 100644index 0000000000..e495b5ccd8--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/DashboardPage.java@@ -0,0 +1,629 @@+package io.onedev.server.ee.dashboard;++import java.lang.reflect.InvocationTargetException;+import java.util.Collections;+import java.util.Comparator;+import java.util.Date;+import java.util.HashMap;+import java.util.HashSet;+import java.util.List;+import java.util.Map;+import java.util.Set;++import javax.annotation.Nullable;++import org.apache.commons.lang3.SerializationUtils;+import org.apache.shiro.authz.UnauthorizedException;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnLoadHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.PropertyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.ee.dashboard.widgets.ProjectListWidget;+import io.onedev.server.entitymanager.DashboardManager;+import io.onedev.server.entitymanager.DashboardVisitManager;+import io.onedev.server.model.Dashboard;+import io.onedev.server.model.DashboardGroupShare;+import io.onedev.server.model.DashboardUserShare;+import io.onedev.server.model.DashboardVisit;+import io.onedev.server.model.User;+import io.onedev.server.model.support.Widget;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.component.svg.SpriteImage;+import io.onedev.server.web.component.typeselect.TypeSelectPanel;+import io.onedev.server.web.page.HomePage;+import io.onedev.server.web.page.layout.LayoutPage;++@SuppressWarnings("serial")+public class DashboardPage extends LayoutPage {++ private static final String PARAM_DASHBOARD = "dashboard";++ private static final int HORIZONTAL_CELL_COUNT = 48;++ private final IModel<List<Dashboard>> dashboardsModel = new LoadableDetachableModel<List<Dashboard>>() {++ @Override+ protected List<Dashboard> load() {+ User user = getLoginUser();+ List<Dashboard> dashboards = getDashboardManager().queryAccessible(user);+ if (!dashboards.isEmpty()) {+ Map<Dashboard, Date> dates = new HashMap<>();+ if (user != null) {+ for (DashboardVisit visit: user.getDashboardVisits())+ dates.put(visit.getDashboard(), visit.getDate());+ }+ Collections.sort(dashboards, new Comparator<Dashboard>() {++ @Override+ public int compare(Dashboard o1, Dashboard o2) {+ Date date1 = dates.get(o1);+ Date date2 = dates.get(o2);+ if (date1 != null) {+ if (date2 != null)+ return date2.compareTo(date1);+ else+ return -1;+ } else {+ if (date2 != null)+ return 1;+ else+ return o2.getId().compareTo(o1.getId());+ }+ }++ });+ }+ return dashboards;+ }++ };++ private final IModel<Dashboard> activeDashboardModel;++ private Dashboard editingDashboard;++ private boolean failsafe;++ public DashboardPage(PageParameters params) {+ super(params);++ Long activeDashboardId = params.get(PARAM_DASHBOARD).toOptionalLong();+ activeDashboardModel = new LoadableDetachableModel<Dashboard>() {++ @Override+ protected Dashboard load() {+ List<Dashboard> dashboards = getDashboards();+ if (activeDashboardId != null) {+ Dashboard activeDashboard = getDashboardManager().load(activeDashboardId);+ if (dashboards.contains(activeDashboard))+ return activeDashboard;+ else+ throw new UnauthorizedException();+ } else if (!dashboards.isEmpty()) {+ return dashboards.iterator().next();+ } else {+ return newDefaultDashboard();+ }+ }++ };++ failsafe = params.get(HomePage.PARAM_FAILSAFE).toBoolean(false);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ editingDashboard = getActiveDashboard();+ add(newDashboardViewer());+ }++ private Component newDashboardViewer() {+ Fragment fragment = new Fragment("content", "dashboardViewFrag", this) {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(OnLoadHeaderItem.forScript(String.format(+ "onedev.server.dashboard.onLoad(%d); $(window).resize();",+ HORIZONTAL_CELL_COUNT)));+ }++ };+ fragment.add(AttributeAppender.append("class", "dashboard-viewer"));+ Dashboard activeDashboard = getActiveDashboard();+ WebMarkupContainer dashboardSelector;+ if (activeDashboard.isNew()) {+ dashboardSelector = new WebMarkupContainer("dashboardSelector") {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("span");+ }++ };+ } else {+ dashboardSelector = new DropdownLink("dashboardSelector") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ Fragment fragment = new Fragment(id, "dashboardSelectorFrag", DashboardPage.this);+ fragment.add(new ListView<Dashboard>("dashboards", new AbstractReadOnlyModel<List<Dashboard>>() {++ @Override+ public List<Dashboard> getObject() {+ return getDashboards();+ }++ }) {++ @Override+ protected void populateItem(ListItem<Dashboard> item) {+ Dashboard dashboard = item.getModelObject();+ Link<Void> link = new Link<Void>("link") {++ @Override+ public void onClick() {+ Dashboard dashboard = item.getModelObject();+ if (getLoginUser() != null)+ visit(dashboard);+ setResponsePage(DashboardPage.class, paramsOf(dashboard, failsafe));+ }++ };++ if (dashboard.equals(getActiveDashboard()))+ link.add(new SpriteImage("icon", "tick"));+ else+ link.add(new WebMarkupContainer("icon"));+ link.add(new Label("label", dashboard.getName()));++ if (getLoginUser() != null && !dashboard.getOwner().equals(getLoginUser()))+ link.add(new Label("note", "Shared by " + dashboard.getOwner().getDisplayName()));+ else+ link.add(new WebMarkupContainer("note").setVisible(false));++ item.add(link);+ }++ });+ return fragment;+ }++ };+ }+ dashboardSelector.add(new Label("name", activeDashboard.getName()));++ String note;+ if (getLoginUser() != null && !activeDashboard.getOwner().equals(getLoginUser()))+ note = "shared by " + activeDashboard.getOwner().getDisplayName();+ else+ note = null;++ if (note != null)+ fragment.add(new Label("dashboardNote", note));+ else+ fragment.add(new WebMarkupContainer("dashboardNote").setVisible(false));++ fragment.add(dashboardSelector);++ fragment.add(new AjaxLink<Void>("editDashboard") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ editingDashboard = getActiveDashboard();+ Component editor = newDashboardEditor();+ DashboardPage.this.replace(editor);+ target.add(editor);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getLoginUser() != null && getActiveDashboard().getOwner().equals(getLoginUser()));+ }++ });+ fragment.add(new AjaxLink<Void>("copyDashboard") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ editingDashboard = SerializationUtils.clone(getActiveDashboard());+ editingDashboard.setId(null);+ Component editor = newDashboardEditor();+ DashboardPage.this.replace(editor);+ target.add(editor);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getLoginUser() != null && !getActiveDashboard().isNew());+ }++ });+ fragment.add(new AjaxLink<Void>("shareDashboard") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getLoginUser() != null+ && getActiveDashboard().getOwner().equals(getLoginUser())+ && !getActiveDashboard().isNew());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ DashboardShareBean bean = new DashboardShareBean();+ for (DashboardGroupShare share: getActiveDashboard().getGroupShares())+ bean.getShareGroups().add(share.getGroup().getName());+ for (DashboardUserShare share: getActiveDashboard().getUserShares())+ bean.getShareUsers().add(share.getUser().getName());++ bean.setForEveryone(getActiveDashboard().isForEveryone());++ Set<String> excludeProperties = new HashSet<>();+ if (!SecurityUtils.isAdministrator())+ excludeProperties.add(DashboardShareBean.PROP_FOR_EVERYONE);+ new BeanEditModalPanel<DashboardShareBean>(target, bean, excludeProperties,+ true, "Share Dashboard") {++ @Override+ protected void onSave(AjaxRequestTarget target, DashboardShareBean bean) {+ Dashboard dashboard = getActiveDashboard();++ dashboard.setForEveryone(bean.isForEveryone());+ getDashboardManager().update(dashboard);++ getDashboardManager().syncShares(dashboard, bean.isForEveryone(),+ bean.getShareGroups(), bean.getShareUsers());+ close();+ }++ };++ }++ });+ fragment.add(new AjaxLink<Void>("deleteDashboard") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ Dashboard dashboard = getActiveDashboard();+ if (dashboard.isForEveryone()+ || !dashboard.getGroupShares().isEmpty()+ || !dashboard.getUserShares().isEmpty()) {+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(""+ + "This dashboard is currently being shared with others, "+ + "do you really want to delete it?"));+ } else {+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(""+ + "Do you really want to delete this dashboard?"));+ }+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ getDashboardManager().delete(getActiveDashboard());+ setResponsePage(DashboardPage.class);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getLoginUser() != null+ && getActiveDashboard().getOwner().equals(getLoginUser())+ && !getActiveDashboard().isNew());+ }++ });+ fragment.add(new AjaxLink<Void>("addDashboard") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ editingDashboard = new Dashboard();+ Component editor = newDashboardEditor();+ DashboardPage.this.replace(editor);+ target.add(editor);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getLoginUser() != null);+ }++ });++ RepeatingView widgetsView = new RepeatingView("widgets");+ for (Widget widget: activeDashboard.getWidgets())+ widgetsView.add(new WidgetPanel(widgetsView.newChildId(), widget, failsafe, null));++ fragment.add(widgetsView);++ fragment.setOutputMarkupId(true);+ return fragment;+ }++ private void visit(Dashboard dashboard) {+ DashboardVisit visit = getLoginUser().getDashboardVisit(dashboard);+ if (visit == null) {+ visit = new DashboardVisit();+ visit.setDashboard(dashboard);+ visit.setUser(getLoginUser());+ getLoginUser().getDashboardVisits().add(visit);+ }+ visit.setDate(new Date());+ if (visit.isNew())+ getDashboardVisitManager().create(visit);+ else+ getDashboardVisitManager().update(visit);+ }++ private DashboardManager getDashboardManager() {+ return OneDev.getInstance(DashboardManager.class);+ }++ private DashboardVisitManager getDashboardVisitManager() {+ return OneDev.getInstance(DashboardVisitManager.class);+ }++ private void markFormDirty(AjaxRequestTarget target, Form<?> form) {+ String script = String.format("onedev.server.form.markDirty($('#%s'));", form.getMarkupId());+ target.appendJavaScript(script);+ }++ private WidgetPanel newWidgetPanel(Form<?> form, RepeatingView widgetsView, Widget widget) {+ return new WidgetPanel(widgetsView.newChildId(), widget, failsafe, new WidgetEditCallback() {++ @Override+ public void onSave(AjaxRequestTarget target, WidgetPanel widgetPanel) {+ markFormDirty(target, form);+ }++ @Override+ public void onDelete(AjaxRequestTarget target, WidgetPanel widgetPanel) {+ editingDashboard.getWidgets().remove(widget);+ markFormDirty(target, form);+ widgetsView.remove(widgetPanel);+ target.appendJavaScript(String.format("$('#%s').remove();", widgetPanel.getMarkupId()));+ }++ @Override+ public void onCopy(AjaxRequestTarget target, Widget widget) {+ onWidgetAdded(target, form, widgetsView, widget);+ }++ });+ }++ private Component newDashboardEditor() {+ Fragment fragment = new Fragment("content", "dashboardEditFrag", this) {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(OnLoadHeaderItem.forScript(String.format(+ "onedev.server.dashboard.onLoad(%d); $(window).resize();",+ HORIZONTAL_CELL_COUNT)));+ }++ };+ fragment.add(AttributeAppender.append("class", "dashboard-editor"));+ fragment.setOutputMarkupId(true);++ Form<?> form = new Form<Void>("form");+ IModel<String> nameModel = new PropertyModel<String>(editingDashboard, "name");+ form.add(new TextField<String>("name", nameModel));++ RepeatingView widgetsView = new RepeatingView("widgets");+ for (Widget widget: editingDashboard.getWidgets())+ widgetsView.add(newWidgetPanel(form, widgetsView, widget));++ fragment.add(widgetsView);++ form.add(new DropdownLink("addWidget") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new TypeSelectPanel<Widget>(id) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Class<? extends Widget> type) {+ dropdown.close();++ Widget widget;+ try {+ widget = type.getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {+ throw new RuntimeException(e);+ }+ new BeanEditModalPanel<Widget>(target, widget) {++ @Override+ protected void onSave(AjaxRequestTarget target, Widget bean) {+ onWidgetAdded(target, form, widgetsView, bean);+ close();+ }++ };+ }++ };+ }++ });++ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ if (editingDashboard.getName() == null) {+ error("Name is required");+ } else {+ Dashboard dashboardWithSameName = getDashboardManager().find(getLoginUser(), editingDashboard.getName());+ if (dashboardWithSameName != null+ && (editingDashboard.isNew() || !dashboardWithSameName.equals(editingDashboard))) {+ error("This name is already been used by another dashboard under your account");+ }+ }++ if (!hasErrorMessage()) {+ if (editingDashboard.isNew()) {+ editingDashboard.setOwner(getLoginUser());+ getDashboardManager().create(editingDashboard);+ visit(editingDashboard);+ setResponsePage(DashboardPage.class, paramsOf(editingDashboard, failsafe));+ } else {+ Dashboard dashboard = getActiveDashboard();+ dashboard.setName(editingDashboard.getName());+ dashboard.setWidgets(editingDashboard.getWidgets());+ getDashboardManager().update(dashboard);+ visit(dashboard);+ setResponsePage(DashboardPage.class, paramsOf(dashboard, failsafe));+ }+ } else {+ target.add(form);+ }+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ editingDashboard = new Dashboard();+ Component viewer = newDashboardViewer();+ DashboardPage.this.replace(viewer);+ target.add(viewer);+ }++ });+ form.add(new FencedFeedbackPanel("feedback", form));+ form.setOutputMarkupId(true);++ fragment.add(form);++ return fragment;+ }++ private void initWidgetPosition(Widget widget) {+ int top = 0;+ while (true) {+ for (int left = 0; left <= HORIZONTAL_CELL_COUNT - widget.getDefaultWidth(); left++) {+ widget.setLeft(left);+ widget.setTop(top);+ widget.setRight(left + widget.getDefaultWidth());+ widget.setBottom(top + widget.getDefaultHeight());+ if (editingDashboard.getWidgets().stream().noneMatch(it->it.isIntersectedWith(widget)))+ return;+ }+ top++;+ }+ }++ private void onWidgetAdded(AjaxRequestTarget target, Form<?> form, RepeatingView widgetsView, Widget widget) {+ initWidgetPosition(widget);+ editingDashboard.getWidgets().add(widget);+ markFormDirty(target, form);+ WidgetPanel widgetPanel = newWidgetPanel(form, widgetsView, widget);+ widgetsView.add(widgetPanel);+ target.prependJavaScript(String.format(+ "$('.dashboard>.body>.content').append('<div id=\"%s\"></div>');",+ widgetPanel.getMarkupId()));+ target.add(widgetPanel);+ target.appendJavaScript(String.format("onedev.server.dashboard.onWidgetAdded('%s');",+ widgetPanel.getMarkupId()));+ }++ private Dashboard newDefaultDashboard() {+ Dashboard dashboard = new Dashboard();+ ProjectListWidget widget = new ProjectListWidget();+ widget.setTitle("Projects");+ widget.setLeft(0);+ widget.setRight(HORIZONTAL_CELL_COUNT);+ widget.setTop(0);+ widget.setBottom(16);+ dashboard.getWidgets().add(widget);+ dashboard.setName("Default");+ dashboard.setOwner(getLoginUser());+ return dashboard;+ }++ private List<Dashboard> getDashboards() {+ return dashboardsModel.getObject();+ }++ private Dashboard getActiveDashboard() {+ return activeDashboardModel.getObject();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new DashboardResourceReference()));+ }++ @Override+ protected void onDetach() {+ dashboardsModel.detach();+ activeDashboardModel.detach();+ super.onDetach();+ }++ @Override+ protected Component newTopbarTitle(String componentId) {+ return new Label(componentId, "Dashboards");+ }++ public static PageParameters paramsOf(@Nullable Dashboard dashboard, boolean failsafe) {+ PageParameters params = new PageParameters();+ if (dashboard != null)+ params.add(PARAM_DASHBOARD, dashboard.getId());+ if (failsafe)+ params.add(HomePage.PARAM_FAILSAFE, true);+ return params;+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/DashboardResourceReference.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/DashboardResourceReference.javanew file mode 100644index 0000000000..9c244db46d--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/DashboardResourceReference.java@@ -0,0 +1,32 @@+package io.onedev.server.ee.dashboard;++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 io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;+import io.onedev.server.web.asset.snapsvg.SnapSvgResourceReference;+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class DashboardResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public DashboardResourceReference() {+ super(DashboardResourceReference.class, "dashboard.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(JavaScriptHeaderItem.forReference(new SnapSvgResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(+ DashboardResourceReference.class, "dashboard.css")));+ return dependencies;+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/DashboardShareBean.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/DashboardShareBean.javanew file mode 100644index 0000000000..d544332e12--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/DashboardShareBean.java@@ -0,0 +1,126 @@+package io.onedev.server.ee.dashboard;++import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.server.OneDev;+import io.onedev.server.annotation.ChoiceProvider;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.ShowCondition;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.MembershipManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.Group;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.EditContext;+import io.onedev.server.util.facade.UserFacade;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;+import java.util.Set;+import java.util.TreeSet;++@Editable+public class DashboardShareBean implements Serializable {++ private static final long serialVersionUID = 1L;++ public static final String PROP_FOR_EVERYONE = "forEveryone";++ private boolean forEveryone;++ private List<String> shareGroups = new ArrayList<>();++ private List<String> shareUsers = new ArrayList<>();++ @Editable(order=100, name="To Everyone")+ public boolean isForEveryone() {+ return forEveryone;+ }++ public void setForEveryone(boolean forEveryone) {+ this.forEveryone = forEveryone;+ }++ @SuppressWarnings("unused")+ private static boolean isNotForEveryone() {+ return !(boolean) EditContext.get().getInputValue("forEveryone");+ }++ @Editable(order=200, name="Share with Groups", descriptionProvider="getShareGroupsDescription")+ @ShowCondition("isNotForEveryone")+ @ChoiceProvider("getGroupChoices")+ public List<String> getShareGroups() {+ return shareGroups;+ }++ public void setShareGroups(List<String> shareGroups) {+ this.shareGroups = shareGroups;+ }++ @SuppressWarnings("unused")+ private static String getShareGroupsDescription() {+ if (SecurityUtils.isAdministrator()) {+ return "Share dashboard with specified groups";+ } else {+ return "Share this dashboard with all members of specified groups. Note that as a non-"+ + "admin user you can only share with groups you are currently a member of";+ }+ }++ @SuppressWarnings("unused")+ private static List<String> getGroupChoices() {+ List<String> groups = new ArrayList<>();+ if (SecurityUtils.isAdministrator()) {+ for (Group group: OneDev.getInstance(GroupManager.class).query())+ groups.add(group.getName());+ } else {+ for (Group group: SecurityUtils.getUser().getGroups())+ groups.add(group.getName());+ }+ Collections.sort(groups);++ return groups;+ }++ @Editable(order=300, name="Share with Users", descriptionProvider="getShareUsersDescription")+ @ShowCondition("isNotForEveryone")+ @ChoiceProvider("getUserChoices")+ public List<String> getShareUsers() {+ return shareUsers;+ }++ public void setShareUsers(List<String> shareUsers) {+ this.shareUsers = shareUsers;+ }++ @SuppressWarnings("unused")+ private static String getShareUsersDescription() {+ if (SecurityUtils.isAdministrator()) {+ return "Share dashboard with specified users";+ } else {+ return "Share this dashboard with specified users. Note that as a non-admin user you "+ + "can only share with members of groups you are currently a member of";+ }+ }++ @SuppressWarnings("unused")+ private static List<String> getUserChoices() {+ Set<String> users = new TreeSet<>();+ if (SecurityUtils.isAdministrator()) {+ for (UserFacade user: OneDev.getInstance(UserManager.class).cloneCache().values()) {+ if (user.getId() > 0)+ users.add(user.getName());+ }+ } else {+ for (User user: OneDev.getInstance(MembershipManager.class).queryMembers(SecurityUtils.getUser()))+ users.add(user.getName());+ }+ users.remove(SecurityUtils.getUser().getName());++ List<String> choices = new ArrayList<>(users);+ Collections.sort(choices);+ return choices;+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/WidgetEditCallback.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/WidgetEditCallback.javanew file mode 100644index 0000000000..ef3b951141--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/WidgetEditCallback.java@@ -0,0 +1,17 @@+package io.onedev.server.ee.dashboard;++import java.io.Serializable;++import org.apache.wicket.ajax.AjaxRequestTarget;++import io.onedev.server.model.support.Widget;++interface WidgetEditCallback extends Serializable {++ void onSave(AjaxRequestTarget target, WidgetPanel widgetPanel);++ void onCopy(AjaxRequestTarget target, Widget widget);++ void onDelete(AjaxRequestTarget target, WidgetPanel widgetPanel);++}\ No newline at end of filediff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/WidgetPanel.html b/server-ee/src/main/java/io/onedev/server/ee/dashboard/WidgetPanel.htmlnew file mode 100644index 0000000000..b4acdb5bbf--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/WidgetPanel.html@@ -0,0 +1,9 @@+<wicket:panel>+ <div class="head d-flex align-items-center flex-shrink-0">+ <span wicket:id="title" class="title text-truncate overflow-hidden mr-4"></span>+ <a wicket:id="actions" class="ml-auto actions"><wicket:svg href="ellipsis" class="icon"/></a>+ <a wicket:id="refresh" class="ml-auto refresh"><wicket:svg href="refresh2" class="icon icon-sm"/></a>+ </div>+ <div wicket:id="body" class="body overflow-auto flex-grow-1">+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/WidgetPanel.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/WidgetPanel.javanew file mode 100644index 0000000000..fb92be5b72--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/WidgetPanel.java@@ -0,0 +1,253 @@+package io.onedev.server.ee.dashboard;++import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.commons.lang3.SerializationUtils;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;+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.markup.head.IHeaderResponse;+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.panel.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;++import io.onedev.server.model.support.Widget;+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;+import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.menu.MenuItem;+import io.onedev.server.web.component.menu.MenuLink;++@SuppressWarnings("serial")+class WidgetPanel extends Panel {++ private final Widget widget;++ private final boolean failsafe;++ private final WidgetEditCallback editCallback;++ private AbstractDefaultAjaxBehavior callbackBehavior;++ public WidgetPanel(String id, Widget widget, boolean failsafe, @Nullable WidgetEditCallback editCallback) {+ super(id);+ this.widget = widget;+ this.failsafe = failsafe;+ this.editCallback = editCallback;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("title", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return widget.getTitle();+ }++ }).setOutputMarkupId(true));++ add(new MenuLink("actions") {++ @Override+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {+ List<MenuItem> menuItems = new ArrayList<>();++ menuItems.add(new MenuItem() {++ @Override+ public String getLabel() {+ return "Refresh";+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return new AjaxLink<Void>(id) {++ @Override+ public void onClick(AjaxRequestTarget target) {+ dropdown.close();++ Component body = widget.render("body", failsafe);+ WidgetPanel.this.replace(body);+ target.add(body);+ }++ };+ }++ });++ menuItems.add(new MenuItem() {++ @Override+ public String getLabel() {+ return "Edit";+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return new AjaxLink<Void>(id) {++ @Override+ public void onClick(AjaxRequestTarget target) {+ dropdown.close();++ new BeanEditModalPanel<Widget>(target, widget) {++ @Override+ protected void onSave(AjaxRequestTarget target, Widget bean) {+ target.add(WidgetPanel.this.get("title"));+ Component body = widget.render("body", failsafe);+ WidgetPanel.this.replace(body);+ target.add(body);++ editCallback.onSave(target, WidgetPanel.this);+ close();+ }++ };+ }++ };+ }++ });++ menuItems.add(new MenuItem() {++ @Override+ public String getLabel() {+ return "Copy";+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return new AjaxLink<Void>(id) {++ @Override+ public void onClick(AjaxRequestTarget target) {+ dropdown.close();++ new BeanEditModalPanel<Widget>(target, SerializationUtils.clone(widget)) {++ @Override+ protected void onSave(AjaxRequestTarget target, Widget bean) {+ target.add(WidgetPanel.this);+ editCallback.onCopy(target, bean);+ close();+ }++ };+ }++ };+ }++ });++ menuItems.add(new MenuItem() {++ @Override+ public String getLabel() {+ return "Delete";+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return new AjaxLink<Void>(id) {++ @Override+ public void onClick(AjaxRequestTarget target) {+ dropdown.close();+ editCallback.onDelete(target, WidgetPanel.this);+ }++ };+ }++ });++ return menuItems;+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(editCallback != null);+ }++ });++ add(new AjaxLink<Void>("refresh") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Component body = widget.render("body", failsafe);+ WidgetPanel.this.replace(body);+ target.add(body);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(editCallback == null);+ }++ });++ add(widget.render("body", failsafe).setOutputMarkupId(true));++ if (editCallback != null) {+ add(callbackBehavior = new AbstractPostAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();+ widget.setLeft(params.getParameterValue("left").toInt());+ widget.setTop(params.getParameterValue("top").toInt());+ widget.setRight(params.getParameterValue("right").toInt());+ widget.setBottom(params.getParameterValue("bottom").toInt());+ }++ });+ }++ setOutputMarkupId(true);+ }++ public Widget getWidget() {+ return widget;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ CharSequence callback;+ if (callbackBehavior != null) {+ callback = callbackBehavior.getCallbackFunction(+ CallbackParameter.explicit("left"),+ CallbackParameter.explicit("top"),+ CallbackParameter.explicit("right"),+ CallbackParameter.explicit("bottom"));+ } else {+ callback = "undefined";+ }+ String script = String.format("onedev.server.dashboard.onWidgetDomReady('%s', %d, %d, %d, %d, %s);",+ getMarkupId(), widget.getLeft(), widget.getTop(), widget.getRight(), widget.getBottom(), callback);+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/dashboard.css b/server-ee/src/main/java/io/onedev/server/ee/dashboard/dashboard.cssnew file mode 100644index 0000000000..8228a8c9f0--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/dashboard.css@@ -0,0 +1,128 @@+.DashboardPage .topbar {+ box-shadow: none;+ border-bottom: 1px solid var(--light-gray);+}+.dark-mode.DashboardPage .topbar {+ border-bottom-color: var(--dark-mode-lighter-dark);+}++.dashboard>.head {+ background: white;+ box-shadow: 0px 0px 4px 0px rgba(0,0,0,0.1);+}+.dashboard>.head .feedbackPanel {+ margin-bottom: 0;+}+.dark-mode .dashboard>.head {+ background: var(--dark-mode-dark);+ box-shadow: 0 0 12px rgb(0 0 0 / 50%);+ color: white;+}+.dark-mode .dashboard {+ background: var(--dark-mode-darker);+}++.dashboard>.head>span.dashboard-selector>svg {+ display: none;+}+.dashboard>.head {+ padding: 0.6rem 1.2rem;+}+.dashboard>.head .feedbackPanelERROR {+ background: none;+ border: none;+ padding: 0;+}+.dashboard>.body>.content>.grid {+ width: 100%;+}++.dashboard>.body>.content>.widget {+ border-radius: 0.42rem;+ display: none;+ background: white;+ position: absolute;+ left: 0;+ top: 0;+ z-index: 1;+}+.dark-mode .dashboard>.body>.content>.widget {+ background: var(--dark-mode-dark);+}++.dashboard.dashboard-editor>.body>.content>.widget {+ border: 1px solid var(--light-gray);+}+.dashboard>.body>.content>.widget>.head .refresh {+ display: none;+}+.dashboard>.body>.content>.widget:hover>.head .refresh {+ display: inline;+}+.dark-mode .dashboard.dashboard-editor>.body>.content>.widget {+ border-color: var(--dark-mode-light-dark);+}++.dashboard>.body>.content>.widget>.head {+ border-bottom: 1px solid var(--light-gray);+ padding: 0.6rem 1.2rem;+ font-weight: 600;+ font-size: 1.2rem;+}+.dark-mode .dashboard>.body>.content>.widget>.head {+ border-color: var(--dark-mode-light-dark);+}++.dashboard.dashboard-editor>.body>.content {+ margin: 0.5rem;+}+.dashboard.dashboard-viewer>.body>.content {+ margin: calc(0.5rem - 6px);+ margin-bottom: 0.5rem;+}+@media (min-width: 576px) {+.dashboard.dashboard-editor>.body>.content {+ margin: 2rem;+}+.dashboard.dashboard-viewer>.body>.content {+ margin: calc(2rem - 6px);+ margin-bottom: 2rem;+}+}++.dashboard.dashboard-editor>.body>.content>.widget {+ cursor: move;+}+.dashboard.dashboard-editor>.body>.content>.widget .ui-icon-gripsmall-diagonal-se {+ background-image: none;+}+.dashboard.dashboard-editor>.body>.content>.widget.ui-resizable-resizing {+ z-index: 10;+}+.dashboard>.body>.content>.widget>.body {+ padding: 1rem 1.6rem;+}+.dashboard.dashboard-editor>.body>.content>.widget>.body {+ margin-bottom: 12px;+}+.dashboard.dashboard-editor>.body>.content>.widget {+ background: white url(/img/resize.png) no-repeat right 2px bottom 2px;+ background-size: 8px 8px;+}+.dark-mode .dashboard.dashboard-editor>.body>.content>.widget {+ background: var(--dark-mode-dark) url(/img/resize-dark.png) no-repeat right 2px bottom 2px;+ background-size: 8px 8px;+}+.dashboard.dashboard-editor>.body>.content>.widget>.head>.title {+ margin-right: 0.4rem !important;+}+.dashboard.dashboard-editor>.body>.content>.widget>.head>.grip {+ display: inline !important;+}++.dashboard .card {+ box-shadow: none;+}+.dashboard .card-body {+ padding: 0;+}\ No newline at end of filediff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/dashboard.js b/server-ee/src/main/java/io/onedev/server/ee/dashboard/dashboard.jsnew file mode 100644index 0000000000..061f10f912--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/dashboard.js@@ -0,0 +1,337 @@+onedev.server.dashboard = {+ xCellCount: 0,+ cellMargin: 6,+ cellHeight: 28,+ getCellWidth: function() {+ var xCellCount = onedev.server.dashboard.xCellCount;+ var cellMargin = onedev.server.dashboard.cellMargin;+ return ($(".dashboard>.body>.content>.grid").width() - (xCellCount+1)*cellMargin) / xCellCount;+ },+ placeWidgets: function() {+ /*+ * Reposition all widgets as long as there are something changed as add/move/resize of one widget+ * may affect other widgets, for instance, it may cause scrollbar to appear+ */+ var cellMargin = onedev.server.dashboard.cellMargin;+ var cellHeight = onedev.server.dashboard.cellHeight;+ var cellWidth = onedev.server.dashboard.getCellWidth();+ var bottomMost = onedev.server.dashboard.getBottomMost() * (cellHeight + cellMargin);++ $(".dashboard>.body>.content>.widget").each(function() {+ var $widget = $(this);+ var left = $widget.data("left") * (cellWidth + cellMargin) + cellMargin;+ var top = $widget.data("top") * (cellHeight + cellMargin) + cellMargin;+ var right = $widget.data("right") * (cellWidth + cellMargin);+ var bottom = $widget.data("bottom") * (cellHeight + cellMargin);++ $widget.outerWidth(right - left);+ var height = bottom - top;+ if ($(".dashboard").hasClass("dashboard-editor")) {+ $widget.outerHeight(height);+ } else {+ var hasBeneathWidgets = false;+ var $body = $(".dashboard>.body");+ var $content = $body.children(".content");+ $content.children(".widget").each(function() {+ if (this != $widget[0]+ && $(this).data("bottom") > $widget.data("bottom")+ && $(this).data("right") > $widget.data("left")+ && $(this).data("left") < $widget.data("right")) {+ hasBeneathWidgets = true;+ return false;+ }+ });++ if (!hasBeneathWidgets) {+ var marginTop = $content.css("margin-top");+ marginTop = parseInt(marginTop.substring(0, marginTop.length-2));+ var marginBottom = $content.css("margin-bottom");+ marginBottom = parseInt(marginBottom.substring(0, marginBottom.length-2));+ var screenBottom = $body.height() - marginTop - marginBottom;+ if (bottomMost > screenBottom)+ $widget.outerHeight(bottomMost - top);+ else+ $widget.outerHeight(screenBottom - top);+ } else {+ $widget.outerHeight(height);+ }+ }++ $widget.css({+ left: left,+ top: top+ }).show();+ });+ },+ drawAlignGrid: function() {+ var $grid = $(".dashboard>.body>.content>.grid");++ var xCellCount = onedev.server.dashboard.xCellCount;+ var cellMargin = onedev.server.dashboard.cellMargin;+ var cellHeight = onedev.server.dashboard.cellHeight;+ var cellWidth = onedev.server.dashboard.getCellWidth();++ var paper = Snap($grid[0]);++ $grid.empty();++ for (var i=0; i<=xCellCount; i++) {+ var left = (cellWidth + cellMargin) * i + cellMargin/2;+ var line = paper.line(left, 0, left, $grid.height());+ line.attr({+ stroke: onedev.server.isDarkMode()? "#1e1e2d": "white",+ strokeWidth: cellMargin+ });+ }++ var top = cellMargin/2;+ while (top < $grid.height() - cellMargin/2) {+ var line = paper.line(0, top, $grid.width(), top);+ line.attr({+ stroke: onedev.server.isDarkMode()? "#1e1e2d": "white",+ strokeWidth: cellMargin+ });+ top += cellHeight + cellMargin;+ }+ },+ getBottomMost: function() {+ var bottomMost = 0;+ $(".dashboard>.body>.content>.widget").each(function() {+ if ($(this).data("bottom") > bottomMost)+ bottomMost = $(this).data("bottom");+ });+ return bottomMost;+ },+ adjustGridHeight: function() {+ var $grid = $(".dashboard>.body>.content>.grid");++ var bottomMost = onedev.server.dashboard.getBottomMost();++ if ($(".dashboard").hasClass("dashboard-editor"))+ bottomMost += 8;++ var expectedHeight = bottomMost * (onedev.server.dashboard.cellHeight + onedev.server.dashboard.cellMargin);+ if ($grid.height() != expectedHeight) {+ $grid.height(expectedHeight);+ return true;+ } else {+ return false;+ }+ },+ onLoad: function(xCellCount) {+ onedev.server.dashboard.xCellCount = xCellCount;++ onedev.server.dashboard.adjustGridHeight();++ var editMode = $(".dashboard").hasClass("dashboard-editor");+ if (editMode)+ onedev.server.dashboard.drawAlignGrid();++ onedev.server.dashboard.placeWidgets();++ $(".dashboard>.body>.content").on("resized", function() {+ setTimeout(function() {+ if (editMode)+ onedev.server.dashboard.drawAlignGrid();+ onedev.server.dashboard.placeWidgets();+ });+ });+ },+ onWidgetDomReady: function(widgetId, left, top, right, bottom, callback) {+ var $widget = $("#" + widgetId);+ $widget.data("left", left).data("top", top).data("right", right).data("bottom", bottom).data("callback", callback);+ if (callback) {+ var initialWidth, initialHeight;+ $widget.resizable({+ minWidth: 100,+ minHeight: 80,+ start: function() {+ initialWidth = $widget.outerWidth();+ initialHeight = $widget.outerHeight();+ },+ stop: function() {+ var $content = $(".dashboard>.body>.content");+ var $grid = $content.children(".grid");+ var left = $widget.offset().left - $grid.offset().left;+ var top = $widget.offset().top - $grid.offset().top;+ var coordination = onedev.server.dashboard.getCoordination($widget, {+ left: left,+ top: top,+ right: left + $widget.outerWidth(),+ bottom: top + $widget.outerHeight()+ }, false);+ if (coordination) {+ $widget.data("left", coordination.left).data("top", coordination.top)+ .data("right", coordination.right).data("bottom", coordination.bottom);+ if (onedev.server.dashboard.adjustGridHeight())+ onedev.server.dashboard.drawAlignGrid();+ onedev.server.dashboard.placeWidgets();+ $widget.find(".resize-aware").trigger("resized");+ $widget.data("callback")(coordination.left, coordination.top, coordination.right, coordination.bottom);+ onedev.server.form.markDirty($content.closest(".body").prev().find("form"));+ } else {+ $widget.addClass("ui-resizable-resizing");+ $widget.effect("size", {+ to: {+ width: initialWidth,+ height: initialHeight+ }+ }, 250, function() {+ $widget.removeClass("ui-resizable-resizing");+ });+ }+ }+ });++ $widget.on("resize", function(e) {+ e.stopPropagation();+ });+ }+ },+ getCellSpan: function(position, cellSize) {+ var cellMargin = onedev.server.dashboard.cellMargin;+ var count = Math.floor(position / (cellSize + cellMargin));+ if (Math.abs(position - count * (cellSize + cellMargin)) > Math.abs(position - (count + 1) * (cellSize + cellMargin)))+ return count + 1;+ else+ return count;+ },+ onWidgetAdded: function(widgetId) {+ var $widget = $("#" + widgetId);+ if (onedev.server.dashboard.adjustGridHeight())+ onedev.server.dashboard.drawAlignGrid();+ onedev.server.dashboard.placeWidgets();+ $widget[0].scrollIntoViewIfNeeded(false);+ $widget.effect("bounce", {distance: 10});+ },+ isRectIntersected: function(rect1, rect2) {+ return !(rect2.left >= rect1.right || rect2.right <= rect1.left || rect2.top >= rect1.bottom || rect2.bottom <= rect1.top);+ },+ getCoordination: function($widget, rect, move) {+ var $content = $(".dashboard>.body>.content");++ var left = rect.left;+ var top = rect.top;++ var right = rect.right;+ var bottom = rect.bottom;++ if (left < 0) {+ right -= left;+ left = 0;+ }++ if (top < 0) {+ bottom -= top;+ top = 0;+ }++ var maxWidth = $content.outerWidth();+ var maxHeight = $content.outerHeight();++ if (right > maxWidth)+ right = maxWidth;+ if (bottom > maxHeight)+ bottom = maxHeight;++ right = onedev.server.dashboard.getCellSpan(right, onedev.server.dashboard.getCellWidth());+ bottom = onedev.server.dashboard.getCellSpan(bottom, onedev.server.dashboard.cellHeight);++ if (move) {+ left = right - $widget.data("right") + $widget.data("left");+ top = bottom - $widget.data("bottom") + $widget.data("top");+ } else {+ left = $widget.data("left");+ top = $widget.data("top");+ }++ if ($widget.data("left") != left || $widget.data("top") != top+ || $widget.data("right") != right || $widget.data("bottom") != bottom) {++ var hasIntersection = false;+ $(".dashboard>.body>.content>.widget").each(function() {+ if (this != $widget[0]) {+ var thisRect = {+ left: $(this).data("left"),+ top: $(this).data("top"),+ right: $(this).data("right"),+ bottom: $(this).data("bottom")+ };+ var widgetRect = {+ left: left,+ top: top,+ right: right,+ bottom: bottom+ }+ if (onedev.server.dashboard.isRectIntersected(thisRect, widgetRect)) {+ hasIntersection = true;+ return false;+ }+ }+ });++ if (!hasIntersection) {+ return {+ left: left,+ top: top,+ right: right,+ bottom: bottom+ }+ }+ }+ },+ getMoveRect: function(event) {+ var widgetData = onedev.server.dashboard.draggingWidgetData;+ var $widget = $("#" + widgetData.id);+ var $grid = $(".dashboard>.body>.content>.grid");++ var left = event.pageX - $grid.offset().left - widgetData.offsetX;+ var top = event.pageY - $grid.offset().top - widgetData.offsetY;++ return {+ left: left,+ top: top,+ right: left + $widget.outerWidth(),+ bottom: top + $widget.outerHeight()+ }+ },+ onDragStart: function(event) {+ event.dataTransfer.setData("widget", "");+ onedev.server.dashboard.draggingWidgetData = {+ id: event.target.id,+ offsetX: event.offsetX,+ offsetY: event.offsetY+ };+ event.dataTransfer.effectAllowed = "move";+ },+ onDragOver: function(event) {+ if (event.dataTransfer.types.includes("widget")) {+ event.dataTransfer.dropEffect = "move";++ var widgetData = onedev.server.dashboard.draggingWidgetData;+ var $widget = $("#" + widgetData.id);++ if (onedev.server.dashboard.getCoordination($widget, onedev.server.dashboard.getMoveRect(event), true))+ event.preventDefault();+ }+ },+ onDrop: function(event) {+ if (event.dataTransfer.types.includes("widget")) {+ var $widget = $("#" + onedev.server.dashboard.draggingWidgetData.id);+ var coordination = onedev.server.dashboard.getCoordination($widget, onedev.server.dashboard.getMoveRect(event), true);+ if (coordination) {+ $widget.data("left", coordination.left).data("top", coordination.top)+ .data("right", coordination.right).data("bottom", coordination.bottom);+ if (onedev.server.dashboard.adjustGridHeight())+ onedev.server.dashboard.drawAlignGrid();+ onedev.server.dashboard.placeWidgets();++ $widget.data("callback")(coordination.left, coordination.top, coordination.right, coordination.bottom);+ var $content = $(".dashboard>.body>.content");+ onedev.server.form.markDirty($content.closest(".body").prev().find("form"));++ event.preventDefault();+ }+ }+ }+}\ No newline at end of filediff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/BuildListWidget.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/BuildListWidget.javanew file mode 100644index 0000000000..866735bed4--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/BuildListWidget.java@@ -0,0 +1,125 @@+package io.onedev.server.ee.dashboard.widgets;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.annotation.BuildQuery;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.ProjectChoice;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.Widget;+import io.onedev.server.security.permission.AccessProject;+import io.onedev.server.web.component.build.list.BuildListPanel;+import org.apache.wicket.Component;+import org.apache.wicket.model.Model;++import java.util.ArrayList;+import java.util.Collections;+import java.util.List;++@Editable(name="Build List", order=300)+public class BuildListWidget extends Widget {++ private static final long serialVersionUID = 1L;++ private String projectPath;++ private String baseQuery;++ private boolean showJob = true;++ private boolean showRef = true;++ @Editable(order=100, name="Project", placeholder="All accessible", description="Optionally specify project to "+ + "show builds of. Leave empty to show builds of all projects with permissions")+ @ProjectChoice("getPermittedProjects")+ public String getProjectPath() {+ return projectPath;+ }++ public void setProjectPath(String projectPath) {+ this.projectPath = projectPath;+ }++ private static ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ @SuppressWarnings("unused")+ private static List<Project> getPermittedProjects() {+ List<Project> projects = new ArrayList<>(getProjectManager().getPermittedProjects(new AccessProject()));+ Collections.sort(projects, getProjectManager().cloneCache().comparingPath());+ return projects;+ }++ @Editable(order=200, placeholder="All builds", description="Optionally specify base query of the list")+ @BuildQuery(withCurrentUserCriteria=true)+ public String getBaseQuery() {+ return baseQuery;+ }++ public void setBaseQuery(String baseQuery) {+ this.baseQuery = baseQuery;+ }++ @Editable(order=300, description="Whether or not to show job column")+ public boolean isShowJob() {+ return showJob;+ }++ public void setShowJob(boolean showJob) {+ this.showJob = showJob;+ }++ @Editable(order=300, name="Show branch/tag", description="Whether or not to show branch/tag column")+ public boolean isShowRef() {+ return showRef;+ }++ public void setShowRef(boolean showRef) {+ this.showRef = showRef;+ }++ @Override+ public int getDefaultWidth() {+ return 30;+ }++ @Override+ public int getDefaultHeight() {+ return 24;+ }++ @Override+ protected Component doRender(String componentId) {+ Long projectId;+ if (projectPath != null) {+ Project project = getProjectManager().findByPath(projectPath);+ if (project == null)+ throw new ExplicitException("Project not found: " + projectPath);+ else+ projectId = project.getId();+ } else {+ projectId = null;+ }+ return new BuildListPanel(componentId, Model.of((String)null), showJob, showRef, 0) {++ private static final long serialVersionUID = 1L;++ @Override+ protected Project getProject() {+ if (projectId != null)+ return getProjectManager().load(projectId);+ else+ return null;+ }++ @Override+ protected io.onedev.server.search.entity.build.BuildQuery getBaseQuery() {+ return io.onedev.server.search.entity.build.BuildQuery.parse(getProject(), baseQuery, true, true);+ }++ };+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/IssueListWidget.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/IssueListWidget.javanew file mode 100644index 0000000000..f547259fd2--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/IssueListWidget.java@@ -0,0 +1,109 @@+package io.onedev.server.ee.dashboard.widgets;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.IssueQuery;+import io.onedev.server.annotation.ProjectChoice;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.Widget;+import io.onedev.server.search.entity.issue.IssueQueryParseOption;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.AccessProject;+import io.onedev.server.web.component.issue.list.IssueListPanel;+import org.apache.wicket.Component;+import org.apache.wicket.model.Model;++import java.util.ArrayList;+import java.util.Collections;+import java.util.List;++@Editable(name="Issue List", order=200)+public class IssueListWidget extends Widget {++ private static final long serialVersionUID = 1L;++ private String projectPath;++ private String baseQuery;++ @Editable(order=100, name="Project", placeholder="All accessible", description="Optionally specify project "+ + "to show issues of. Leave empty to show issues of all accessible projects")+ @ProjectChoice("getPermittedProjects")+ public String getProjectPath() {+ return projectPath;+ }++ public void setProjectPath(String projectPath) {+ this.projectPath = projectPath;+ }++ private static ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ @SuppressWarnings("unused")+ private static List<Project> getPermittedProjects() {+ List<Project> projects = new ArrayList<>(getProjectManager().getPermittedProjects(new AccessProject()));+ Collections.sort(projects, getProjectManager().cloneCache().comparingPath());+ return projects;+ }++ @Editable(order=200, placeholder="All issues", description="Optionally specify base query of the list")+ @IssueQuery(withCurrentUserCriteria=true)+ public String getBaseQuery() {+ return baseQuery;+ }++ public void setBaseQuery(String baseQuery) {+ this.baseQuery = baseQuery;+ }++ @Override+ public int getDefaultWidth() {+ return 30;+ }++ @Override+ public int getDefaultHeight() {+ return 24;+ }++ @Override+ protected Component doRender(String componentId) {+ Long projectId;+ if (projectPath != null) {+ Project project = getProjectManager().findByPath(projectPath);+ if (project == null)+ throw new ExplicitException("Project not found: " + projectPath);+ else if (!SecurityUtils.canAccess(project))+ throw new ExplicitException("Permission denied");+ else+ projectId = project.getId();+ } else {+ projectId = null;+ }+ return new IssueListPanel(componentId, Model.of((String)null)) {++ private static final long serialVersionUID = 1L;++ @Override+ protected Project getProject() {+ if (projectId != null)+ return getProjectManager().load(projectId);+ else+ return null;+ }++ @Override+ protected io.onedev.server.search.entity.issue.IssueQuery getBaseQuery() {+ IssueQueryParseOption option = new IssueQueryParseOption();+ option.withCurrentUserCriteria(true);+ return io.onedev.server.search.entity.issue.IssueQuery.parse(getProject(), baseQuery, option, true);+ }++ };+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/MarkdownBlobWidget.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/MarkdownBlobWidget.javanew file mode 100644index 0000000000..6c20e3a608--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/MarkdownBlobWidget.java@@ -0,0 +1,331 @@+package io.onedev.server.ee.dashboard.widgets;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.commons.utils.PlanarRange;+import io.onedev.server.OneDev;+import io.onedev.server.annotation.BlobChoice;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.ProjectChoice;+import io.onedev.server.annotation.RevisionChoice;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.git.Blob;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.Widget;+import io.onedev.server.search.code.hit.QueryHit;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ReadCode;+import io.onedev.server.util.EditContext;+import io.onedev.server.util.ProjectScopedCommit;+import io.onedev.server.web.component.markdown.MarkdownViewer;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;+import io.onedev.server.web.util.FileUpload;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.model.Model;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;++import javax.validation.constraints.NotEmpty;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.List;++@Editable(name="Markdown from File", order=10010)+public class MarkdownBlobWidget extends Widget {++ private static final long serialVersionUID = 1L;++ private String projectPath;++ private String revision;++ private String filePath;++ @Editable(order=100, name="Project")+ @ProjectChoice("getPermittedProjects")+ @NotEmpty+ public String getProjectPath() {+ return projectPath;+ }++ public void setProjectPath(String projectPath) {+ this.projectPath = projectPath;+ }++ @SuppressWarnings("unused")+ private static List<Project> getPermittedProjects() {+ List<Project> projects = new ArrayList<>(getProjectManager().getPermittedProjects(new ReadCode()));+ Collections.sort(projects, getProjectManager().cloneCache().comparingPath());+ return projects;+ }++ @Editable(order=200)+ @RevisionChoice("getCurrentProject")+ @NotEmpty+ public String getRevision() {+ return revision;+ }++ public void setRevision(String revision) {+ this.revision = revision;+ }++ private static Project getCurrentProject() {+ String projectPath = (String) EditContext.get().getInputValue("projectPath");+ if (projectPath != null)+ return getProjectManager().findByPath(projectPath);+ else+ return null;+ }++ @Editable(order=300)+ @BlobChoice(commitProvider="getCurrentCommit", patterns="**/*.md **/*.MD")+ @NotEmpty+ public String getFilePath() {+ return filePath;+ }++ public void setFilePath(String filePath) {+ this.filePath = filePath;+ }++ @Override+ public int getDefaultWidth() {+ return 30;+ }++ @Override+ public int getDefaultHeight() {+ return 24;+ }++ @SuppressWarnings("unused")+ private static ProjectScopedCommit getCurrentCommit() {+ Project project = getCurrentProject();+ if (project != null) {+ String revision = (String) EditContext.get().getInputValue("revision");+ if (revision != null)+ return new ProjectScopedCommit(project, project.getRevCommit(revision, true));+ else+ return null;+ } else {+ return null;+ }+ }++ private static ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ @Override+ protected Component doRender(String componentId) {+ Project project = getProjectManager().findByPath(projectPath);+ if (project == null)+ throw new ExplicitException("Project not found: " + projectPath);+ else if (!SecurityUtils.canReadCode(project))+ throw new ExplicitException("Permission denied");++ Long projectId = project.getId();++ BlobIdent blobIdent = new BlobIdent(revision, filePath);+ Blob blob = project.getBlob(blobIdent, false);+ if (blob == null) {+ String message = String.format("File not found (revision: %s, file: %s)", revision, filePath);+ throw new ExplicitException(message);+ }++ return new MarkdownViewer(componentId, Model.of(blob.getText().getContent()), null) {++ private static final long serialVersionUID = 1L;++ @Override+ protected BlobRenderContext getRenderContext() {+ return new BlobRenderContext() {++ private static final long serialVersionUID = 1L;++ @Override+ public Project getProject() {+ return getProjectManager().load(projectId);+ }++ @Override+ public BlobIdent getBlobIdent() {+ return blobIdent;+ }++ @Override+ public String getPosition() {+ throw new UnsupportedOperationException();+ }++ @Override+ public String getCoverageReport() {+ throw new UnsupportedOperationException();+ }++ @Override+ public String getProblemReport() {+ throw new UnsupportedOperationException();+ }++ @Override+ public void onPosition(AjaxRequestTarget target, String position) {+ throw new UnsupportedOperationException();+ }++ @Override+ public String getPositionUrl(String position) {+ throw new UnsupportedOperationException();+ }++ @Override+ public String getDirectory() {+ if (blobIdent.path.contains("/"))+ return StringUtils.substringBeforeLast(blobIdent.path, "/");+ else+ return null;+ }++ @Override+ public String getDirectoryUrl() {+ BlobIdent blobIdent = new BlobIdent("main", getDirectory(), FileMode.TREE.getBits());+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);+ return urlFor(ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject(), state)).toString();+ }++ @Override+ public String getRootDirectoryUrl() {+ throw new UnsupportedOperationException();+ }++ @Override+ public Mode getMode() {+ return Mode.VIEW;+ }++ @Override+ public boolean isViewPlain() {+ throw new UnsupportedOperationException();+ }++ @Override+ public String getUrlBeforeEdit() {+ throw new UnsupportedOperationException();+ }++ @Override+ public String getUrlAfterEdit() {+ throw new UnsupportedOperationException();+ }++ @Override+ public boolean isOnBranch() {+ throw new UnsupportedOperationException();+ }++ @Override+ public String getRefName() {+ throw new UnsupportedOperationException();+ }++ @Override+ public void pushState(AjaxRequestTarget target, BlobIdent blobIdent, String position) {+ throw new UnsupportedOperationException();+ }++ @Override+ public void replaceState(AjaxRequestTarget target, BlobIdent blobIdent, String position) {+ throw new UnsupportedOperationException();+ }++ @Override+ public void onSelect(AjaxRequestTarget target, BlobIdent blobIdent, String position) {+ throw new UnsupportedOperationException();+ }++ @Override+ public void onSearchComplete(AjaxRequestTarget target, List<QueryHit> hits) {+ throw new UnsupportedOperationException();+ }++ @Override+ public void onModeChange(AjaxRequestTarget target, Mode mode, String newPath) {+ throw new UnsupportedOperationException();+ }++ @Override+ public void onModeChange(AjaxRequestTarget target, Mode mode, boolean viewPlain, String newPath) {+ throw new UnsupportedOperationException();+ }++ @Override+ public void onCommitted(AjaxRequestTarget target, ObjectId commitId) {+ throw new UnsupportedOperationException();+ }++ @Override+ public void onCommentOpened(AjaxRequestTarget target, CodeComment comment, PlanarRange range) {+ throw new UnsupportedOperationException();+ }++ @Override+ public void onCommentClosed(AjaxRequestTarget target) {+ throw new UnsupportedOperationException();+ }++ @Override+ public void onAddComment(AjaxRequestTarget target, PlanarRange range) {+ throw new UnsupportedOperationException();+ }++ @Override+ public ObjectId uploadFiles(Collection<FileUpload> uploads, String directory,+ String commitMessage) {+ throw new UnsupportedOperationException();+ }++ @Override+ public CodeComment getOpenComment() {+ throw new UnsupportedOperationException();+ }++ @Override+ public RevCommit getCommit() {+ throw new UnsupportedOperationException();+ }++ @Override+ public String getNewPath() {+ throw new UnsupportedOperationException();+ }++ @Override+ public String getInitialNewPath() {+ throw new UnsupportedOperationException();+ }++ @Override+ public String appendRaw(String url) {+ return ProjectBlobPage.doAppendRaw(url);+ }++ @Override+ public PullRequest getPullRequest() {+ throw new UnsupportedOperationException();+ }++ };+ }++ };+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/MarkdownWidget.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/MarkdownWidget.javanew file mode 100644index 0000000000..541473234b--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/MarkdownWidget.java@@ -0,0 +1,45 @@+package io.onedev.server.ee.dashboard.widgets;++import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Markdown;+import io.onedev.server.model.support.Widget;+import io.onedev.server.web.component.markdown.MarkdownViewer;+import org.apache.wicket.Component;+import org.apache.wicket.model.Model;++import javax.validation.constraints.NotEmpty;++@Editable(name="Markdown", order=10000)+public class MarkdownWidget extends Widget {++ private static final long serialVersionUID = 1L;++ private String markdown;++ @Override+ public int getDefaultWidth() {+ return 30;+ }++ @Override+ public int getDefaultHeight() {+ return 24;+ }++ @Editable(order=100)+ @Markdown+ @NotEmpty+ public String getMarkdown() {+ return markdown;+ }++ public void setMarkdown(String markdown) {+ this.markdown = markdown;+ }++ @Override+ protected Component doRender(String componentId) {+ return new MarkdownViewer(componentId, Model.of(markdown), null);+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/MilestoneListWidget.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/MilestoneListWidget.javanew file mode 100644index 0000000000..c9f173c9e5--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/MilestoneListWidget.java@@ -0,0 +1,86 @@+package io.onedev.server.ee.dashboard.widgets;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.ProjectChoice;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.Widget;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.AccessProject;+import io.onedev.server.util.MilestoneSort;+import io.onedev.server.web.component.milestone.list.MilestoneListPanel;+import org.apache.wicket.Component;+import org.apache.wicket.model.LoadableDetachableModel;++import javax.validation.constraints.NotEmpty;+import java.util.ArrayList;+import java.util.Collections;+import java.util.List;++@Editable(order=210, name="Milestone List")+public class MilestoneListWidget extends Widget {++ private static final long serialVersionUID = 1L;++ private String projectPath;++ @Editable(order=100)+ @ProjectChoice("getPermittedProjects")+ @NotEmpty+ public String getProjectPath() {+ return projectPath;+ }++ public void setProjectPath(String projectPath) {+ this.projectPath = projectPath;+ }++ @Override+ public int getDefaultWidth() {+ return 36;+ }++ @Override+ public int getDefaultHeight() {+ return 16;+ }++ private static ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ @SuppressWarnings("unused")+ private static List<Project> getPermittedProjects() {+ List<Project> projects = new ArrayList<>(getProjectManager().getPermittedProjects(new AccessProject()));+ Collections.sort(projects, getProjectManager().cloneCache().comparingPath());+ return projects;+ }++ @Override+ protected Component doRender(String componentId) {+ Long projectId;+ Project project = getProjectManager().findByPath(projectPath);+ if (project == null)+ throw new ExplicitException("Project not found: " + projectPath);+ else+ projectId = project.getId();++ if (SecurityUtils.canAccess(project)) {+ return new MilestoneListPanel(componentId, new LoadableDetachableModel<Project>() {++ private static final long serialVersionUID = 1L;++ @Override+ protected Project load() {+ return getProjectManager().load(projectId);+ }++ }, false, MilestoneSort.CLOSEST_DUE_DATE, null);+ } else {+ throw new ExplicitException("Permission denied");+ }+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/ProjectListWidget.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/ProjectListWidget.javanew file mode 100644index 0000000000..ac74147ad0--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/ProjectListWidget.java@@ -0,0 +1,52 @@+package io.onedev.server.ee.dashboard.widgets;++import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.ProjectQuery;+import org.apache.wicket.Component;+import org.apache.wicket.model.Model;++import io.onedev.server.model.support.Widget;+import io.onedev.server.web.component.project.list.ProjectListPanel;++@Editable(name="Project List", order=100)+public class ProjectListWidget extends Widget {++ private static final long serialVersionUID = 1L;++ private String baseQuery;++ @Editable(order=100, placeholder="All accessible", description="Optionally specify a base query for the list")+ @ProjectQuery+ public String getBaseQuery() {+ return baseQuery;+ }++ public void setBaseQuery(String baseQuery) {+ this.baseQuery = baseQuery;+ }++ @Override+ public int getDefaultWidth() {+ return 30;+ }++ @Override+ public int getDefaultHeight() {+ return 24;+ }++ @Override+ protected Component doRender(String componentId) {+ return new ProjectListPanel(componentId, Model.of((String)null), 0) {++ private static final long serialVersionUID = 1L;++ @Override+ protected io.onedev.server.search.entity.project.ProjectQuery getBaseQuery() {+ return io.onedev.server.search.entity.project.ProjectQuery.parse(baseQuery);+ }++ };+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/PullRequestListWidget.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/PullRequestListWidget.javanew file mode 100644index 0000000000..0bae179158--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/PullRequestListWidget.java@@ -0,0 +1,107 @@+package io.onedev.server.ee.dashboard.widgets;++import java.util.ArrayList;+import java.util.Collections;+import java.util.List;++import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.ProjectChoice;+import io.onedev.server.annotation.PullRequestQuery;+import org.apache.wicket.Component;+import org.apache.wicket.model.Model;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.Widget;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ReadCode;+import io.onedev.server.web.component.pullrequest.list.PullRequestListPanel;++@Editable(name="Pull Request List", order=300)+public class PullRequestListWidget extends Widget {++ private static final long serialVersionUID = 1L;++ private String projectPath;++ private String baseQuery;++ @Editable(order=100, name="Project", placeholder="All accessible", description="Optionally specify project "+ + "to show issues of. Leave empty to show issues of all accessible projects")+ @ProjectChoice("getPermittedProjects")+ public String getProjectPath() {+ return projectPath;+ }++ public void setProjectPath(String projectPath) {+ this.projectPath = projectPath;+ }++ private static ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ @SuppressWarnings("unused")+ private static List<Project> getPermittedProjects() {+ List<Project> projects = new ArrayList<>(getProjectManager().getPermittedProjects(new ReadCode()));+ Collections.sort(projects, getProjectManager().cloneCache().comparingPath());+ return projects;+ }++ @Editable(order=200, placeholder="All pull requests", description="Optionally specify base query of the list")+ @PullRequestQuery+ public String getBaseQuery() {+ return baseQuery;+ }++ public void setBaseQuery(String baseQuery) {+ this.baseQuery = baseQuery;+ }++ @Override+ public int getDefaultWidth() {+ return 30;+ }++ @Override+ public int getDefaultHeight() {+ return 24;+ }++ @Override+ protected Component doRender(String componentId) {+ Long projectId;+ if (projectPath != null) {+ Project project = getProjectManager().findByPath(projectPath);+ if (project == null)+ throw new ExplicitException("Project not found: " + projectPath);+ else if (!SecurityUtils.canReadCode(project))+ throw new ExplicitException("Permission denied");+ else+ projectId = project.getId();+ } else {+ projectId = null;+ }+ return new PullRequestListPanel(componentId, Model.of((String)null)) {++ private static final long serialVersionUID = 1L;++ @Override+ protected Project getProject() {+ if (projectId != null)+ return getProjectManager().load(projectId);+ else+ return null;+ }++ @Override+ protected io.onedev.server.search.entity.pullrequest.PullRequestQuery getBaseQuery() {+ return io.onedev.server.search.entity.pullrequest.PullRequestQuery.parse(getProject(), baseQuery, true);+ }++ };+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/WidgetGroup.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/WidgetGroup.javanew file mode 100644index 0000000000..82a90cd0b7--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/WidgetGroup.java@@ -0,0 +1,7 @@+package io.onedev.server.ee.dashboard.widgets;++public class WidgetGroup {++ public static final String REPORTS = "Reports";++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/ProjectOverviewCssResourceReference.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/ProjectOverviewCssResourceReference.javanew file mode 100644index 0000000000..18dcfb3a75--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/ProjectOverviewCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.ee.dashboard.widgets.projectoverview;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class ProjectOverviewCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public ProjectOverviewCssResourceReference() {+ super(ProjectOverviewCssResourceReference.class, "project-overview.css");+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/ProjectOverviewPanel.html b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/ProjectOverviewPanel.htmlnew file mode 100644index 0000000000..02e7be49a7--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/ProjectOverviewPanel.html@@ -0,0 +1,9 @@+<wicket:panel>+ <div class="project-overview">+ <div wicket:id="description" class="description bg-light rounded px-3 py-2"></div>+ <div wicket:id="codeStats" class="code-stats"></div>+ <div wicket:id="pullRequestStats" class="pull-request-stats"></div>+ <div wicket:id="issueStats" class="issue-stats"></div>+ <div wicket:id="buildStats" class="build-stats"></div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/ProjectOverviewPanel.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/ProjectOverviewPanel.javanew file mode 100644index 0000000000..cdd5869dc5--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/ProjectOverviewPanel.java@@ -0,0 +1,110 @@+package io.onedev.server.ee.dashboard.widgets.projectoverview;++import java.util.LinkedHashMap;+import java.util.Map;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;++import com.google.common.collect.Lists;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequest.Status;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.ProjectBuildStats;+import io.onedev.server.util.ProjectIssueStats;+import io.onedev.server.util.ProjectPullRequestStats;+import io.onedev.server.web.component.markdown.MarkdownViewer;+import io.onedev.server.web.component.project.stats.build.BuildStatsPanel;+import io.onedev.server.web.component.project.stats.code.CodeStatsPanel;+import io.onedev.server.web.component.project.stats.issue.IssueStatsPanel;+import io.onedev.server.web.component.project.stats.pullrequest.PullRequestStatsPanel;++@SuppressWarnings("serial")+public class ProjectOverviewPanel extends GenericPanel<Project> {++ public ProjectOverviewPanel(String id, IModel<Project> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (getProject().getDescription() != null)+ add(new MarkdownViewer("description", Model.of(getProject().getDescription()), null));+ else+ add(new WebMarkupContainer("description").setVisible(false));++ if (getProject().isCodeManagement() && SecurityUtils.canReadCode(getProject())) {+ add(new CodeStatsPanel("codeStats", getModel()));+ add(new PullRequestStatsPanel("pullRequestStats", getModel(), new LoadableDetachableModel<Map<PullRequest.Status, Long>>() {++ @Override+ protected Map<Status, Long> load() {+ Map<PullRequest.Status, Long> statusCount = new LinkedHashMap<>();+ for (ProjectPullRequestStats stats: OneDev.getInstance(PullRequestManager.class).queryStats(Lists.newArrayList(getProject()))) {+ statusCount.put(stats.getPullRequestStatus(), stats.getStatusCount());+ }+ return statusCount;+ }++ }));+ } else {+ add(new WebMarkupContainer("codeStats").setVisible(false));+ add(new WebMarkupContainer("pullRequestStats").setVisible(false));+ }++ if (getProject().isIssueManagement()) {+ add(new IssueStatsPanel("issueStats", getModel(), new LoadableDetachableModel<Map<Integer, Long>>() {++ @Override+ protected Map<Integer, Long> load() {+ Map<Integer, Long> stateCount = new LinkedHashMap<>();+ for (ProjectIssueStats stats: OneDev.getInstance(IssueManager.class).queryStats(Lists.newArrayList(getProject()))) {+ stateCount.put(stats.getStateOrdinal(), stats.getStateCount());+ }+ return stateCount;+ }++ }));+ } else {+ add(new WebMarkupContainer("issueStats").setVisible(false));+ }++ add(new BuildStatsPanel("buildStats", getModel(), new LoadableDetachableModel<Map<Build.Status, Long>>() {++ @Override+ protected Map<Build.Status, Long> load() {+ Map<Build.Status, Long> statusCount = new LinkedHashMap<>();+ for (ProjectBuildStats stats: OneDev.getInstance(BuildManager.class).queryStats(Lists.newArrayList(getProject()))) {+ statusCount.put(stats.getBuildStatus(), stats.getStatusCount());+ }+ return statusCount;+ }++ }));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ProjectOverviewCssResourceReference()));+ }++ private Project getProject() {+ return getModelObject();+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/ProjectOverviewWidget.java b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/ProjectOverviewWidget.javanew file mode 100644index 0000000000..d4da5db6ee--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/ProjectOverviewWidget.java@@ -0,0 +1,86 @@+package io.onedev.server.ee.dashboard.widgets.projectoverview;++import java.util.ArrayList;+import java.util.Collections;+import java.util.List;++import javax.validation.constraints.NotEmpty;++import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.ProjectChoice;+import org.apache.wicket.Component;+import org.apache.wicket.model.LoadableDetachableModel;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.Widget;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.AccessProject;++@Editable(order=110, name="Project Overview")+public class ProjectOverviewWidget extends Widget {++ private static final long serialVersionUID = 1L;++ private String projectPath;++ @Editable(order=100)+ @ProjectChoice("getPermittedProjects")+ @NotEmpty+ public String getProjectPath() {+ return projectPath;+ }++ public void setProjectPath(String projectPath) {+ this.projectPath = projectPath;+ }++ @Override+ public int getDefaultWidth() {+ return 16;+ }++ @Override+ public int getDefaultHeight() {+ return 24;+ }++ private static ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ @SuppressWarnings("unused")+ private static List<Project> getPermittedProjects() {+ List<Project> projects = new ArrayList<>(getProjectManager().getPermittedProjects(new AccessProject()));+ Collections.sort(projects, getProjectManager().cloneCache().comparingPath());+ return projects;+ }++ @Override+ protected Component doRender(String componentId) {+ Long projectId;+ Project project = getProjectManager().findByPath(projectPath);+ if (project == null)+ throw new ExplicitException("Project not found: " + projectPath);+ else+ projectId = project.getId();++ if (SecurityUtils.canAccess(project)) {+ return new ProjectOverviewPanel(componentId, new LoadableDetachableModel<Project>() {++ private static final long serialVersionUID = 1L;++ @Override+ protected Project load() {+ return getProjectManager().load(projectId);+ }++ });+ } else {+ throw new ExplicitException("Permission denied");+ }+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/project-overview.css b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/project-overview.cssnew file mode 100644index 0000000000..c268f5e697--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/dashboard/widgets/projectoverview/project-overview.css@@ -0,0 +1,6 @@+.project-overview>div {+ margin-bottom: 1rem;+}+.project-overview>div:last-child {+ margin-bottom: 0;+}diff --git a/server-ee/src/main/java/io/onedev/server/ee/storage/EEStorageManager.java b/server-ee/src/main/java/io/onedev/server/ee/storage/EEStorageManager.javanew file mode 100644index 0000000000..957653dcbc--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/storage/EEStorageManager.java@@ -0,0 +1,157 @@+package io.onedev.server.ee.storage;++import com.google.common.base.Preconditions;+import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.commons.loader.ManagedSerializedForm;+import io.onedev.commons.utils.ExplicitException;+import io.onedev.commons.utils.FileUtils;+import io.onedev.server.cluster.ClusterManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.event.Listen;+import io.onedev.server.event.entity.EntityRemoved;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.persistence.TransactionManager;+import io.onedev.server.storage.StorageManager;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;+import java.io.File;+import java.io.IOException;+import java.io.ObjectStreamException;+import java.io.Serializable;+import java.nio.file.Files;++import static io.onedev.commons.bootstrap.Bootstrap.getSiteDir;+import static io.onedev.server.model.Build.getArtifactsDir;++@Singleton+public class EEStorageManager implements StorageManager, Serializable {++ private final SettingManager settingManager;++ private final TransactionManager transactionManager;++ private final ClusterManager clusterManager;++ private final ProjectManager projectManager;++ @Inject+ public EEStorageManager(SettingManager settingManager, TransactionManager transactionManager,+ ClusterManager clusterManager, ProjectManager projectManager) {+ this.settingManager = settingManager;+ this.transactionManager = transactionManager;+ this.clusterManager = clusterManager;+ this.projectManager = projectManager;+ }++ @Nullable+ private File getLfsStorageDir(Long projectId) {+ StorageSetting storageSetting = settingManager.getContributedSetting(StorageSetting.class);+ if (storageSetting != null && storageSetting.getLfsStore() != null) {+ var lfsStoreDir = getSiteDir().toPath().resolve(storageSetting.getLfsStore()).toFile();+ if (!lfsStoreDir.exists())+ throw new ExplicitException("Lfs store directory not exist");+ return new File(lfsStoreDir, String.valueOf(projectId));+ } else {+ return null;+ }+ }++ @Nullable+ private File getArtifactsStorageDir(Long projectId, @Nullable Long buildNumber) {+ StorageSetting storageSetting = settingManager.getContributedSetting(StorageSetting.class);+ if (storageSetting != null && storageSetting.getArtifactStore() != null) {+ var artifactsStoreDir = getSiteDir().toPath().resolve(storageSetting.getArtifactStore()).toFile();+ if (!artifactsStoreDir.exists())+ throw new ExplicitException("Artifacts store directory not exist");+ String subpath = String.valueOf(projectId);+ if (buildNumber != null)+ subpath += "/" + Build.getStoragePath(buildNumber);+ return new File(artifactsStoreDir, subpath);+ } else {+ return null;+ }+ }++ @Override+ public File initLfsDir(Long projectId) {+ File gitDir = projectManager.getGitDir(projectId);+ File lfsStorageDir = getLfsStorageDir(projectId);+ var lfsDir = new File(gitDir, "lfs");+ if (lfsStorageDir != null) {+ if (!lfsDir.exists()) {+ FileUtils.createDir(lfsStorageDir);+ try {+ Files.createSymbolicLink(lfsDir.toPath(), lfsStorageDir.toPath());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ } else {+ FileUtils.createDir(lfsDir);+ }+ return lfsDir;+ }++ @Override+ public File initArtifactsDir(Long projectId, Long buildNumber) {+ File artifactsStorageDir = getArtifactsStorageDir(projectId, buildNumber);+ File artifactsDir = getArtifactsDir(projectId, buildNumber);+ if (artifactsStorageDir != null) {+ if (!artifactsDir.exists()) {+ FileUtils.createDir(artifactsStorageDir);+ try {+ Files.createSymbolicLink(+ artifactsDir.toPath(),+ artifactsStorageDir.toPath());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ } else {+ FileUtils.createDir(artifactsDir);+ }+ return artifactsDir;+ }++ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Build) {+ Build build = (Build) event.getEntity();+ Long projectId = build.getProject().getId();+ Long buildNumber = build.getNumber();+ String activeServer = projectManager.getActiveServer(projectId, false);+ if (activeServer != null) {+ transactionManager.runAfterCommit(() -> clusterManager.submitToServer(activeServer, () -> {+ File artifactsStorageDir = getArtifactsStorageDir(projectId, buildNumber);+ if (artifactsStorageDir != null && artifactsStorageDir.exists())+ FileUtils.deleteDir(artifactsStorageDir);+ return null;+ }));+ }+ } else if (event.getEntity() instanceof Project) {+ Project project = (Project) event.getEntity();+ Long projectId = project.getId();+ var activeServer = projectManager.getActiveServer(projectId, false);+ if (activeServer != null) {+ transactionManager.runAfterCommit(() -> clusterManager.submitToServer(activeServer, () -> {+ File lfsStorageDir = getLfsStorageDir(projectId);+ if (lfsStorageDir != null && lfsStorageDir.exists())+ FileUtils.deleteDir(lfsStorageDir);+ File artifactsStorageDir = getArtifactsStorageDir(projectId, null);+ if (artifactsStorageDir != null && artifactsStorageDir.exists())+ FileUtils.deleteDir(artifactsStorageDir);+ return null;+ }));+ }+ }+ }++ public Object writeReplace() throws ObjectStreamException {+ return new ManagedSerializedForm(StorageManager.class);+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/storage/StorageSetting.java b/server-ee/src/main/java/io/onedev/server/ee/storage/StorageSetting.javanew file mode 100644index 0000000000..f6b2302467--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/storage/StorageSetting.java@@ -0,0 +1,40 @@+package io.onedev.server.ee.storage;++import io.onedev.server.annotation.DataDirectory;+import io.onedev.server.annotation.Editable;+import io.onedev.server.web.page.layout.ContributedAdministrationSetting;++@Editable+public class StorageSetting implements ContributedAdministrationSetting {++ private static final long serialVersionUID = 1L;++ private String lfsStore;++ private String artifactStore;++ @Editable(order=100, description = "Optionally specify a directory to store git lfs files. " ++ "Non-absolute directory is considered to be relative to site directory. Leave " ++ "empty to store under directory '<project dir>/git/lfs'. ")+ @DataDirectory+ public String getLfsStore() {+ return lfsStore;+ }++ public void setLfsStore(String lfsStore) {+ this.lfsStore = lfsStore;+ }++ @Editable(order=200, description = "Optionally specify a directory to store build artifacts. " ++ "Non-absolute directory is considered to be relative to site directory. Leave empty " ++ "to store under directory '<build dir>/artifacts'")+ @DataDirectory+ public String getArtifactStore() {+ return artifactStore;+ }++ public void setArtifactStore(String artifactStore) {+ this.artifactStore = artifactStore;+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/terminal/BuildTerminalPage.html b/server-ee/src/main/java/io/onedev/server/ee/terminal/BuildTerminalPage.htmlnew file mode 100644index 0000000000..a8a569aea1--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/terminal/BuildTerminalPage.html@@ -0,0 +1,3 @@+<wicket:extend>+ <div class="terminal h-100 resize-aware bg-black"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-ee/src/main/java/io/onedev/server/ee/terminal/BuildTerminalPage.java b/server-ee/src/main/java/io/onedev/server/ee/terminal/BuildTerminalPage.javanew file mode 100644index 0000000000..acc4dd8e8d--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/terminal/BuildTerminalPage.java@@ -0,0 +1,146 @@+package io.onedev.server.ee.terminal;++import java.io.IOException;++import org.apache.wicket.Application;+import org.apache.wicket.Session;+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.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.protocol.ws.api.IWebSocketConnection;+import org.apache.wicket.protocol.ws.api.WebSocketBehavior;+import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;+import org.apache.wicket.protocol.ws.api.message.ClosedMessage;+import org.apache.wicket.protocol.ws.api.message.ConnectedMessage;+import org.apache.wicket.protocol.ws.api.message.TextMessage;+import org.apache.wicket.protocol.ws.api.registry.PageIdKey;+import org.apache.wicket.protocol.ws.api.registry.SimpleWebSocketConnectionRegistry;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.terminal.MessageTypes;+import io.onedev.server.terminal.TerminalManager;+import io.onedev.server.web.page.base.BasePage;++@SuppressWarnings("serial")+public class BuildTerminalPage extends BasePage {++ private static final String PARAM_PROJECT = "project";++ private static final String PARAM_BUILD = "build";++ private final IModel<Build> buildModel;++ public BuildTerminalPage(PageParameters params) {+ super(params);++ Long projectId = params.get(PARAM_PROJECT).toLongObject();++ Long buildNumber = params.get(PARAM_BUILD).toLongObject();+ buildModel = new LoadableDetachableModel<Build>() {++ @Override+ protected Build load() {+ Project project = OneDev.getInstance(ProjectManager.class).load(projectId);+ return OneDev.getInstance(BuildManager.class).find(project, buildNumber);+ }++ };+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new WebSocketBehavior() {++ private TerminalManager getTerminalManager() {+ return OneDev.getInstance(TerminalManager.class);+ }++ @Override+ protected void onConnect(ConnectedMessage message) {+ IWebSocketConnection connection = new SimpleWebSocketConnectionRegistry().getConnection(+ message.getApplication(), message.getSessionId(), message.getKey());+ if (connection != null) {+ try {+ connection.sendMessage(MessageTypes.TERMINAL_OPEN.name());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }++ @Override+ protected void onClose(ClosedMessage message) {+ IWebSocketConnection connection = new SimpleWebSocketConnectionRegistry().getConnection(+ message.getApplication(), message.getSessionId(), message.getKey());+ if (connection != null)+ getTerminalManager().onClose(connection);+ }++ @Override+ protected void onMessage(WebSocketRequestHandler handler, TextMessage message) {+ IWebSocketConnection connection = new SimpleWebSocketConnectionRegistry().getConnection(+ Application.get(), Session.get().getId(), new PageIdKey(getPageId()));+ if (connection != null) {+ if (message.getText().equals(MessageTypes.TERMINAL_READY.name())) {+ getTerminalManager().onOpen(connection, getBuild());+ } else if (message.getText().startsWith(MessageTypes.TERMINAL_INPUT.name())) {+ String input = message.getText().substring(MessageTypes.TERMINAL_INPUT.name().length()+1);+ getTerminalManager().onInput(connection, input);+ } else if (message.getText().startsWith(MessageTypes.TERMINAL_RESIZE.name())) {+ String input = message.getText().substring(MessageTypes.TERMINAL_RESIZE.name().length()+1);+ int rows = Integer.parseInt(StringUtils.substringBefore(input, ":"));+ int cols = Integer.parseInt(StringUtils.substringAfter(input, ":"));+ getTerminalManager().onResize(connection, rows, cols);+ }+ }+ }++ });+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canManage(getBuild().getProject());+ }++ private Build getBuild() {+ return buildModel.getObject();+ }++ @Override+ protected void onDetach() {+ buildModel.detach();+ super.onDetach();+ }++ @Override+ protected String getPageTitle() {+ return "Web Terminal";+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new BuildTerminalResourceReference()));+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.buildTerminal.onDomReady();"));+ }++ public static PageParameters paramsOf(Build build) {+ PageParameters params = new PageParameters();+ params.add(PARAM_PROJECT, build.getProject().getId());+ params.add(PARAM_BUILD, build.getNumber());+ return params;+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/terminal/BuildTerminalResourceReference.java b/server-ee/src/main/java/io/onedev/server/ee/terminal/BuildTerminalResourceReference.javanew file mode 100644index 0000000000..1d4f7f8c46--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/terminal/BuildTerminalResourceReference.java@@ -0,0 +1,26 @@+package io.onedev.server.ee.terminal;++import java.util.List;++import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;++import io.onedev.server.web.asset.xterm.XtermResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class BuildTerminalResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public BuildTerminalResourceReference() {+ super(BuildTerminalResourceReference.class, "build-terminal.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(JavaScriptHeaderItem.forReference(new XtermResourceReference()));+ return dependencies;+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/terminal/EETerminalManager.java b/server-ee/src/main/java/io/onedev/server/ee/terminal/EETerminalManager.javanew file mode 100644index 0000000000..aebb448094--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/terminal/EETerminalManager.java@@ -0,0 +1,259 @@+package io.onedev.server.ee.terminal;++import io.onedev.commons.loader.ManagedSerializedForm;+import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.cluster.ClusterManager;+import io.onedev.server.cluster.ClusterTask;+import io.onedev.server.event.Listen;+import io.onedev.server.event.project.build.BuildEvent;+import io.onedev.server.event.system.SystemStarted;+import io.onedev.server.event.system.SystemStopping;+import io.onedev.server.job.JobManager;+import io.onedev.server.model.Build;+import io.onedev.server.persistence.SessionManager;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.terminal.MessageTypes;+import io.onedev.server.terminal.Terminal;+import io.onedev.server.terminal.TerminalManager;+import io.onedev.server.terminal.WebShell;+import io.onedev.server.util.schedule.SchedulableTask;+import io.onedev.server.util.schedule.TaskScheduler;+import org.apache.wicket.protocol.ws.api.IWebSocketConnection;+import org.apache.wicket.request.cycle.RequestCycle;+import org.quartz.ScheduleBuilder;+import org.quartz.SimpleScheduleBuilder;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;+import java.io.ObjectStreamException;+import java.io.Serializable;+import java.util.Iterator;+import java.util.Map;+import java.util.UUID;+import java.util.concurrent.ConcurrentHashMap;++@Singleton+public class EETerminalManager implements TerminalManager, SchedulableTask, Serializable {++ private static final Logger logger = LoggerFactory.getLogger(EETerminalManager.class);++ private final JobManager jobManager;++ final ClusterManager clusterManager;++ private final TaskScheduler taskScheduler;++ private final SessionManager sessionManager;++ private final Map<IWebSocketConnection, WebShell> shells = new ConcurrentHashMap<>();++ private volatile String taskId;++ @Inject+ public EETerminalManager(JobManager jobManager, TaskScheduler taskScheduler, ClusterManager clusterManager,+ SessionManager sessionManager) {+ this.jobManager = jobManager;+ this.taskScheduler = taskScheduler;+ this.clusterManager = clusterManager;+ this.sessionManager = sessionManager;+ }++ public Object writeReplace() throws ObjectStreamException {+ return new ManagedSerializedForm(TerminalManager.class);+ }++ @Override+ public void onOpen(IWebSocketConnection connection, Build build) {+ try {+ Long buildId = build.getId();+ String sessionId = UUID.randomUUID().toString();+ Terminal terminal = new ServerTerminal(sessionId, clusterManager.getLocalServerAddress());+ shells.put(connection, jobManager.openShell(buildId, terminal));+ } catch (Throwable t) {+ ExplicitException explicitException = ExceptionUtils.find(t, ExplicitException.class);+ if (explicitException != null) {+ sendError(connection, explicitException.getMessage());+ } else {+ logger.error("Error openning shell", t);+ sendError(connection, "Error opening shell, check server log for details");+ }+ }+ }++ @Override+ public void onClose(IWebSocketConnection connection) {+ var shell = shells.remove(connection);+ if (shell != null)+ shell.exit();+ }++ @Override+ public void onInput(IWebSocketConnection connection, String input) {+ var shell = shells.get(connection);+ if (shell != null)+ shell.sendInput(input);+ }++ @Listen+ public void on(SystemStarted event) {+ taskId = taskScheduler.schedule(this);+ }++ @Listen+ public void on(SystemStopping event) {+ if (taskId != null)+ taskScheduler.unschedule(taskId);+ }++ @Sessional+ @Listen+ public void on(BuildEvent event) {+ if (event.getBuild().isFinished()) {+ clusterManager.submitToAllServers(new ClusterTask<Void>() {++ private static final long serialVersionUID = 1L;++ @Override+ public Void call() throws Exception {+ sessionManager.run(new Runnable() {++ @Override+ public void run() {+ for (var it = shells.entrySet().iterator(); it.hasNext();) {+ var entry = it.next();+ WebShell shell = entry.getValue();+ if (shell.getBuildId().equals(event.getBuild().getId())) {+ sendError(entry.getKey(), "Shell exited");+ shell.exit();+ it.remove();+ }+ }+ }++ });+ return null;+ }++ });+ }+ }++ @Override+ public void execute() {+ for (Iterator<Map.Entry<IWebSocketConnection, WebShell>> it = shells.entrySet().iterator(); it.hasNext();) {+ Map.Entry<IWebSocketConnection, WebShell> entry = it.next();+ WebShell shell = entry.getValue();+ if (!entry.getKey().isOpen()) {+ shell.exit();+ it.remove();+ }+ }+ }++ @Override+ public ScheduleBuilder<?> getScheduleBuilder() {+ return SimpleScheduleBuilder.repeatMinutelyForever();+ }++ @Override+ public void onResize(IWebSocketConnection connection, int rows, int cols) {+ WebShell shell = shells.get(connection);+ if (shell != null)+ shell.resize(rows, cols);+ }++ @Override+ public boolean isTerminalSupported() {+ return true;+ }++ @Override+ public String getTerminalUrl(Build build) {+ return RequestCycle.get().urlFor(BuildTerminalPage.class, BuildTerminalPage.paramsOf(build)).toString();+ }++ private void sendOutput(IWebSocketConnection connection, String output) {+ try {+ connection.sendMessage(MessageTypes.TERMINAL_OUTPUT + ":" + output);+ } catch (Exception e) {+ }+ }++ private void sendError(IWebSocketConnection connection, String error) {+ try {+ connection.sendMessage(MessageTypes.TERMINAL_OUTPUT + ":\r\n\033[31m" + error + "\033[0m");+ } catch (Exception e) {+ }+ }++ private void close(IWebSocketConnection connection) {+ try {+ connection.sendMessage(MessageTypes.TERMINAL_CLOSE.name());+ } catch (Exception e) {+ }+ }++ private class ServerTerminal implements Terminal, Serializable {++ private static final long serialVersionUID = 1L;++ private final String sessionId;++ private final String terminalServer;++ public ServerTerminal(String sessionId, String terminalServer) {+ this.sessionId = sessionId;+ this.terminalServer = terminalServer;+ }++ @Nullable+ private IWebSocketConnection getConnection() {+ for (var entry: shells.entrySet()) {+ if (entry.getValue().getSessionId().equals(sessionId))+ return entry.getKey();+ }+ return null;+ }++ @Override+ public void sendOutput(String output) {+ clusterManager.submitToServer(terminalServer, () -> {+ IWebSocketConnection connection = getConnection();+ if (connection != null)+ EETerminalManager.this.sendOutput(connection, output);+ return null;+ });+ }++ @Override+ public void sendError(String error) {+ clusterManager.submitToServer(terminalServer, () -> {+ IWebSocketConnection connection = getConnection();+ if (connection != null)+ EETerminalManager.this.sendError(connection, error);+ return null;+ });+ }++ @Override+ public void close() {+ clusterManager.submitToServer(terminalServer, () -> {+ IWebSocketConnection connection = getConnection();+ if (connection != null)+ EETerminalManager.this.close(connection);+ return null;+ });+ }++ @Override+ public String getSessionId() {+ return sessionId;+ }++ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/terminal/TerminalSession.java b/server-ee/src/main/java/io/onedev/server/ee/terminal/TerminalSession.javanew file mode 100644index 0000000000..3e66206f11--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/terminal/TerminalSession.java@@ -0,0 +1,24 @@+package io.onedev.server.ee.terminal;++import io.onedev.server.terminal.Shell;++public class TerminalSession {++ private final Long buildId;++ private final Shell shell;++ public TerminalSession(Long buildId, Shell shellSession) {+ this.buildId = buildId;+ this.shell = shellSession;+ }++ public Long getBuildId() {+ return buildId;+ }++ public Shell getShell() {+ return shell;+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/terminal/build-terminal.js b/server-ee/src/main/java/io/onedev/server/ee/terminal/build-terminal.jsnew file mode 100644index 0000000000..c9fdb336eb--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/terminal/build-terminal.js@@ -0,0 +1,37 @@+onedev.server.buildTerminal = {+ onDomReady: function() {+ var hasOutput = false;+ var $terminal = $(".terminal");+ var xterm = new Terminal();+ var fitAddon = new window.FitAddon.FitAddon();+ xterm.loadAddon(fitAddon);++ Wicket.Event.subscribe("/websocket/message", function(jqEvent, message) {+ if (message == "TERMINAL_OPEN") {+ xterm.open($(".terminal")[0]);+ xterm.onData(function(data) {+ Wicket.WebSocket.send("TERMINAL_INPUT:" + data);+ });+ xterm.onResize(function(size) {+ Wicket.WebSocket.send("TERMINAL_RESIZE:" + size.rows + ":" + size.cols);+ });+ Wicket.WebSocket.send("TERMINAL_READY");++ $terminal.on("resized", function() {+ if (hasOutput)+ fitAddon.fit();+ });+ } else if (message == "TERMINAL_CLOSE") {+ window.close();+ } else if (message.startsWith("TERMINAL_OUTPUT:")) {+ if (!hasOutput) {+ // fit on first prompt to make sure underlying shell+ // receives the resize command+ hasOutput = true;+ fitAddon.fit();+ }+ xterm.write(message.substring("TERMINAL_OUTPUT:".length));+ }+ });+ }+}\ No newline at end of filediff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeIndexManager.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeIndexManager.javanew file mode 100644index 0000000000..b501dc030d--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeIndexManager.java@@ -0,0 +1,5 @@+package io.onedev.server.ee.xsearch;++public interface CodeIndexManager {++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeSearchCssResourceReference.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeSearchCssResourceReference.javanew file mode 100644index 0000000000..cd72bfef2e--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeSearchCssResourceReference.java@@ -0,0 +1,9 @@+package io.onedev.server.ee.xsearch;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class CodeSearchCssResourceReference extends BaseDependentCssResourceReference {+ public CodeSearchCssResourceReference() {+ super(CodeSearchCssResourceReference.class, "code-search.css");+ }+}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeSearchManager.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeSearchManager.javanew file mode 100644index 0000000000..0a03ec9615--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeSearchManager.java@@ -0,0 +1,15 @@+package io.onedev.server.ee.xsearch;++import io.onedev.server.ee.xsearch.match.BlobMatch;+import io.onedev.server.ee.xsearch.query.BlobQuery;+import io.onedev.server.search.code.query.TooGeneralQueryException;++import java.util.List;++public interface CodeSearchManager {++ List<BlobMatch> search(BlobQuery query) throws TooGeneralQueryException;++ void indexUpdated();++}\ No newline at end of filediff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeSearchPage.html b/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeSearchPage.htmlnew file mode 100644index 0000000000..f7f928bac3--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeSearchPage.html@@ -0,0 +1,45 @@+<wicket:extend>+ <div id="code-search" class="m-2 m-sm-5">+ <div class="card">+ <div class="card-body">+ <form wicket:id="form" class="mb-3">+ <div wicket:id="option"></div>+ <div wicket:id="projects"></div>+ <input wicket:id="search" type="submit" class="btn btn-primary" value="Search">+ </form>+ <div wicket:id="result" class="mt-5"></div>+ </div>+ </div>+ </div>+ <wicket:fragment wicket:id="hasMatchesFrag">+ <ul class="blob-matches list-unstyled mb-0">+ <h6 class="mb-0">Matches Found</h6>+ <li wicket:id="blobMatches" class="blob-match pt-4">+ <a wicket:id="expand" class="expand" title="Toggle matched contents"><wicket:svg href="arrow" class="icon"/></a>+ <a wicket:id="project" class="font-size-lg mr-2" target="_blank">+ <img wicket:id="avatar"></img>+ <span wicket:id="label"></span>+ </a>+ <a wicket:id="blob" class="font-size-lg" target="_blank">+ <wicket:svg href="file" class="icon"></wicket:svg>+ <span wicket:id="label"></span>+ </a>+ <wicket:enclosure child="contentMatches">+ <ul class="content-matches list-unstyled pl-5 mb-0">+ <li wicket:id="contentMatches" class="content-match pt-3">+ <a wicket:id="link" target="_blank">+ <img wicket:id="icon" class="mr-2"></img>+ <span wicket:id="lineNo" class="mr-2 line-no text-monospace text-gray font-size-sm"></span>+ <span wicket:id="content" class="text-monospace font-size-sm"></span>+ </a>+ </li>+ </ul>+ </wicket:enclosure>+ </li>+ </ul>+ <a wicket:id="more" class="mt-4 btn btn-light btn-block">More</a>+ </wicket:fragment>+ <wicket:fragment wicket:id="noMatchesFrag">+ <div class="alert alert-notice alert-light-warning mb-0">No matches</div>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeSearchPage.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeSearchPage.javanew file mode 100644index 0000000000..cf2619d7be--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/CodeSearchPage.java@@ -0,0 +1,333 @@+package io.onedev.server.ee.xsearch;++import com.google.common.base.Preconditions;+import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.server.OneDev;+import io.onedev.server.ee.xsearch.match.BlobMatch;+import io.onedev.server.ee.xsearch.match.ContentMatch;+import io.onedev.server.ee.xsearch.query.FileQuery;+import io.onedev.server.ee.xsearch.query.SymbolQuery;+import io.onedev.server.ee.xsearch.query.TextQuery;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.search.code.query.FileQueryOption;+import io.onedev.server.search.code.query.QueryOption;+import io.onedev.server.search.code.query.SymbolQueryOption;+import io.onedev.server.search.code.query.TextQueryOption;+import io.onedev.server.web.WebSession;+import io.onedev.server.web.behavior.RunTaskBehavior;+import io.onedev.server.web.component.project.ProjectAvatar;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.page.layout.LayoutPage;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;+import org.apache.wicket.Component;+import org.apache.wicket.MetaDataKey;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.FormComponent;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import static io.onedev.server.git.GitUtils.branch2ref;+import static io.onedev.server.util.ReflectionUtils.getTypeArguments;+import static io.onedev.server.web.WebConstants.PAGE_SIZE;+import static io.onedev.server.web.page.project.blob.render.BlobRenderer.getSourcePosition;++public abstract class CodeSearchPage<T extends Serializable> extends LayoutPage {++ private static final MetaDataKey<HashMap<Class<?>, QueryOption>> QUERY_OPTIONS =+ new MetaDataKey<>() {};++ private static final MetaDataKey<String> PROJECTS =+ new MetaDataKey<>() {};++ private QueryOption option;++ private String projects;++ private int page = 1;++ public CodeSearchPage(PageParameters params) {+ super(params);++ List<Class<?>> typeArguments = getTypeArguments(CodeSearchPage.class, getClass());++ try {+ option = (QueryOption) typeArguments.get(0).getDeclaredConstructor().newInstance();+ } catch (Exception e) {+ throw ExceptionUtils.unchecked(e);+ }++ Map<Class<?>, QueryOption> savedOptions = getSavedOptions();+ if (savedOptions.containsKey(option.getClass()))+ option = savedOptions.get(option.getClass());++ String projects = WebSession.get().getMetaData(PROJECTS);+ if (projects != null)+ this.projects = projects;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ var projectsBean = new ProjectsBean();+ projectsBean.setProjects(projects);++ var form = new Form<Void>("form");++ FormComponent<? extends QueryOption> optionEditor = option.newOptionEditor("option");+ form.add(optionEditor);+ form.add(BeanContext.edit("projects", projectsBean));+ form.add(new AjaxButton("search") {++ private RunTaskBehavior runTaskBehavior;++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(runTaskBehavior = new RunTaskBehavior() {++ @Override+ protected void runTask(AjaxRequestTarget target) {+ page = 1;++ var blobMatches = search();++ if (!blobMatches.isEmpty()) {+ var hasMatchesFrag = new Fragment("result", "hasMatchesFrag", CodeSearchPage.this);++ var blobMatchesView = new RepeatingView("blobMatches");+ var firstItem = true;+ for (var blobMatch: blobMatches) {+ blobMatchesView.add(newBlobMatchItem(blobMatchesView.newChildId(), blobMatch, firstItem));+ firstItem = false;+ }+ hasMatchesFrag.add(blobMatchesView);++ hasMatchesFrag.add(new AjaxLink<Void>("more") {++ private RunTaskBehavior runTaskBehavior;++ @Override+ protected void onInitialize() {+ super.onInitialize();++ var moreLink = this;+ add(runTaskBehavior = new RunTaskBehavior() {++ @Override+ protected void runTask(AjaxRequestTarget target) {+ page++;+ var blobMatches = search();+ var firstItem = true;+ for (var blobMatch: blobMatches) {+ var item = newBlobMatchItem(blobMatchesView.newChildId(), blobMatch, firstItem);+ blobMatchesView.add(item);+ var script = String.format("$('.blob-matches').append('<li id=\"%s\"></li>');",+ item.getMarkupId());+ target.prependJavaScript(script);+ target.add(item);+ firstItem = false;+ }+ setVisible(blobMatches.size() == PAGE_SIZE);+ target.add(moreLink);+ }++ });+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ runTaskBehavior.requestRun(target);+ }++ }.setVisible(blobMatches.size() == PAGE_SIZE));++ hasMatchesFrag.setOutputMarkupId(true);+ CodeSearchPage.this.replace(hasMatchesFrag);+ target.add(hasMatchesFrag);+ } else {+ var noMatchesFrag = new Fragment("result", "noMatchesFrag", CodeSearchPage.this);+ noMatchesFrag.setOutputMarkupId(true);+ CodeSearchPage.this.replace(noMatchesFrag);+ target.add(noMatchesFrag);+ }+ }++ });+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ option = optionEditor.getModelObject();+ projects = projectsBean.getProjects();++ var savedOptions = getSavedOptions();+ savedOptions.put(option.getClass(), option);+ WebSession.get().setMetaData(QUERY_OPTIONS, savedOptions);+ WebSession.get().setMetaData(PROJECTS, projects);+ target.add(form);+ runTaskBehavior.requestRun(target);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ add(form);++ add(new WebMarkupContainer("result").setOutputMarkupPlaceholderTag(true).setVisible(false));+ }++ private List<BlobMatch> search() {+ var count = page * PAGE_SIZE;+ var searchManager = OneDev.getInstance(CodeSearchManager.class);+ List<BlobMatch> blobMatches;+ if (option instanceof TextQueryOption) {+ var query = new TextQuery.Builder((TextQueryOption) option)+ .projects(projects)+ .count(count)+ .build();+ blobMatches = searchManager.search(query);+ } else if (option instanceof FileQueryOption) {+ var query = new FileQuery.Builder((FileQueryOption) option)+ .projects(projects)+ .count(count)+ .build();+ blobMatches = searchManager.search(query);+ } else {+ var query = new SymbolQuery.Builder((SymbolQueryOption) option)+ .primary(true)+ .projects(projects)+ .count(count)+ .build();+ blobMatches = searchManager.search(query);++ if (blobMatches.size() < count) {+ query = new SymbolQuery.Builder((SymbolQueryOption) option)+ .primary(false)+ .projects(projects)+ .count(count - blobMatches.size())+ .build();+ blobMatches.addAll(searchManager.search(query));+ }+ }+ var newIndex = (page-1) * PAGE_SIZE;+ if (newIndex < blobMatches.size())+ return blobMatches.subList(newIndex, blobMatches.size());+ else+ return new ArrayList<>();+ }++ private Component newBlobMatchItem(String componentId, BlobMatch blobMatch, boolean firstItem) {+ WebMarkupContainer item = new WebMarkupContainer(componentId);+ var projectId = blobMatch.getProjectId();+ var project = getProjectManager().load(projectId);+ var projectLink = new BookmarkablePageLink<Void>("project",+ ProjectDashboardPage.class,+ ProjectDashboardPage.paramsOf(projectId));+ projectLink.add(new ProjectAvatar("avatar", projectId));+ projectLink.add(new Label("label", project.getPath()));+ item.add(projectLink);++ var revision = Preconditions.checkNotNull(project.getDefaultBranch());+ if (project.getTagRef(revision) != null)+ revision = branch2ref(revision);+ var blobIdent = new BlobIdent(revision, blobMatch.getBlobPath());+ var blobLink = new BookmarkablePageLink<Void>("blob",+ ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(project, blobIdent));+ blobLink.add(new Label("label", blobMatch.getBlobPath()));+ item.add(blobLink);++ var contentMatchesView = new ListView<>("contentMatches", blobMatch.getContentMatches()) {++ @Override+ protected void populateItem(ListItem<ContentMatch> item) {+ var contentMatch = item.getModelObject();+ var project = getProjectManager().load(projectId);+ var state = new ProjectBlobPage.State();+ state.blobIdent = new BlobIdent(blobIdent.revision, blobIdent.path);+ state.position = getSourcePosition(contentMatch.getPosition());+ var link = new BookmarkablePageLink<>("link",+ ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(project, state));+ link.add(contentMatch.renderIcon("icon"));+ link.add(new Label("lineNo", contentMatch.getPosition().getFromRow() + 1));+ link.add(contentMatch.render("content"));+ item.add(link);+ }++ };+ contentMatchesView.setVisible(firstItem);+ item.add(contentMatchesView);++ item.add(new AjaxLink<>("expand") {+ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ @Override+ public String getObject() {+ if (contentMatchesView.isVisible())+ return "expanded";+ else+ return "";+ }+ }));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ contentMatchesView.setVisible(!contentMatchesView.isVisible());+ target.add(item);+ }++ }.setVisible(!blobMatch.getContentMatches().isEmpty()));++ item.setOutputMarkupId(true);+ return item;+ }++ private ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ private HashMap<Class<?>, QueryOption> getSavedOptions() {+ HashMap<Class<?>, QueryOption> savedOptions = WebSession.get().getMetaData(QUERY_OPTIONS);+ if (savedOptions == null)+ savedOptions = new HashMap<>();+ return savedOptions;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new CodeSearchCssResourceReference()));+ }+}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/DefaultCodeIndexManager.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/DefaultCodeIndexManager.javanew file mode 100644index 0000000000..84eae18135--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/DefaultCodeIndexManager.java@@ -0,0 +1,363 @@+package io.onedev.server.ee.xsearch;++import com.google.common.base.Splitter;+import io.onedev.commons.jsymbol.Symbol;+import io.onedev.commons.jsymbol.SymbolExtractor;+import io.onedev.commons.jsymbol.SymbolExtractorRegistry;+import io.onedev.commons.loader.ManagedSerializedForm;+import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.cluster.ClusterManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.event.Listen;+import io.onedev.server.event.project.ActiveServerChanged;+import io.onedev.server.event.project.DefaultBranchChanged;+import io.onedev.server.event.project.ProjectDeleted;+import io.onedev.server.event.project.RefUpdated;+import io.onedev.server.event.system.SystemStarted;+import io.onedev.server.event.system.SystemStarting;+import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Project;+import io.onedev.server.persistence.SessionManager;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.search.code.NGramAnalyzer;+import io.onedev.server.util.ContentDetector;+import io.onedev.server.util.WriterCallable;+import io.onedev.server.util.concurrent.BatchWorkManager;+import io.onedev.server.util.concurrent.BatchWorker;+import io.onedev.server.util.concurrent.Prioritized;+import io.onedev.server.util.lucene.BooleanQueryBuilder;+import io.onedev.server.util.match.Matcher;+import io.onedev.server.util.match.PathMatcher;+import io.onedev.server.util.patternset.PatternSet;+import org.apache.commons.codec.digest.DigestUtils;+import org.apache.commons.lang.SerializationUtils;+import org.apache.lucene.document.*;+import org.apache.lucene.index.*;+import org.apache.lucene.search.IndexSearcher;+import org.apache.lucene.store.Directory;+import org.apache.lucene.store.FSDirectory;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.ObjectLoader;+import org.eclipse.jgit.revwalk.RevWalk;+import org.eclipse.jgit.treewalk.TreeWalk;+import org.eclipse.jgit.treewalk.filter.TreeFilter;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;+import java.io.File;+import java.io.IOException;+import java.io.ObjectStreamException;+import java.io.Serializable;+import java.util.List;++import static io.onedev.server.git.GitUtils.ref2branch;+import static io.onedev.server.search.code.FieldConstants.*;+import static io.onedev.server.search.code.IndexConstants.*;+import static java.lang.Integer.MAX_VALUE;+import static org.apache.lucene.document.LongPoint.newExactQuery;+import static org.apache.lucene.search.BooleanClause.Occur.MUST;++@Singleton+public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {++ private static final Logger logger = LoggerFactory.getLogger(DefaultCodeIndexManager.class);++ private static final int INDEXING_PRIORITY = 100;++ private static final int DATA_VERSION = 1;++ private final ProjectManager projectManager;++ private final SessionManager sessionManager;++ private final ClusterManager clusterManager;++ private final CodeSearchManager searchManager;++ private final BatchWorkManager batchWorkManager;++ @Inject+ public DefaultCodeIndexManager(ProjectManager projectManager, SessionManager sessionManager,+ ClusterManager clusterManager, BatchWorkManager batchWorkManager,+ CodeSearchManager searchManager) {+ this.projectManager = projectManager;+ this.sessionManager = sessionManager;+ this.clusterManager = clusterManager;+ this.batchWorkManager = batchWorkManager;+ this.searchManager = searchManager;+ }++ @Sessional+ @Listen+ public void on(RefUpdated event) {+ var project = event.getProject();+ var branchName = ref2branch(event.getRefName());+ if (branchName != null && branchName.equals(project.getDefaultBranch())+ && !event.getNewCommitId().equals(ObjectId.zeroId())) {+ batchWorkManager.submit(+ getBatchWorker(project.getId()),+ new IndexWork(INDEXING_PRIORITY));+ }+ }+++ @Sessional+ @Listen+ public void on(DefaultBranchChanged event) {+ batchWorkManager.submit(+ getBatchWorker(event.getProject().getId()),+ new IndexWork(INDEXING_PRIORITY));+ }++ @Listen+ public void on(SystemStarting event) {+ File indexDir = getIndexDir();+ FileUtils.createDir(indexDir);+ try (Directory directory = FSDirectory.open(indexDir.toPath())) {+ if (DirectoryReader.indexExists(directory)) {+ try (IndexReader reader = DirectoryReader.open(directory)) {+ } catch (IndexFormatTooOldException e) {+ FileUtils.cleanDir(indexDir);+ }+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ @Listen+ public void on(SystemStarted event) {+ for (var projectId: projectManager.getActiveIds()) {+ batchWorkManager.submit(+ getBatchWorker(projectId),+ new IndexWork(INDEXING_PRIORITY));+ }+ }++ @Listen+ public void on(ActiveServerChanged event) {+ for (var projectId: event.getProjectIds()) {+ batchWorkManager.submit(+ getBatchWorker(projectId),+ new IndexWork(INDEXING_PRIORITY));+ }+ }++ @Listen+ public void on(ProjectDeleted event) {+ Long projectId = event.getProjectId();+ clusterManager.submitToAllServers(() -> {+ callWithWriter(writer -> writer.deleteDocuments(newExactQuery(PROJECT_ID.name(), projectId)));+ return null;+ });+ }++ private BatchWorker getBatchWorker(Long projectId) {+ return new BatchWorker("project-" + projectId + "-indexDefaultBranch", MAX_VALUE) {++ @Override+ public void doWorks(List<Prioritized> works) {+ callWithWriter(writer -> {+ sessionManager.run(() -> {+ var project = projectManager.load(projectId);+ try (Directory directory = FSDirectory.open(getIndexDir().toPath())) {+ if (DirectoryReader.indexExists(directory)) {+ try (IndexReader reader = DirectoryReader.open(directory)) {+ IndexSearcher searcher = new IndexSearcher(reader);+ doIndex(project, writer, searcher);+ }+ } else {+ doIndex(project, writer, null);+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ });+ return null;+ });+ }++ };+ }++ private File getIndexDir() {+ return new File(OneDev.getIndexDir(), "code");+ }++ private String getIndexVersion(String filePatterns) {+ return DigestUtils.md5Hex(DATA_VERSION + ";" + SymbolExtractorRegistry.getVersion() + ";" + filePatterns);+ }++ private synchronized <T> T callWithWriter(WriterCallable<T> callable) {+ File indexDir = getIndexDir();+ try (Directory directory = FSDirectory.open(indexDir.toPath());) {+ var writerConfig = new IndexWriterConfig(new NGramAnalyzer(NGRAM_SIZE, NGRAM_SIZE));+ writerConfig.setOpenMode(IndexWriterConfig.OpenMode.CREATE_OR_APPEND);+ try (IndexWriter writer = new IndexWriter(directory, writerConfig)) {+ try {+ var result = callable.call(writer);+ writer.commit();+ return result;+ } catch (Exception e) {+ writer.rollback();+ throw ExceptionUtils.unchecked(e);+ } finally {+ searchManager.indexUpdated();+ }+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ private void doIndex(Project project, IndexWriter writer, @Nullable IndexSearcher searcher) throws IOException {+ var defaultBranch = project.getDefaultBranch();+ if (defaultBranch != null) {+ logger.debug("Indexing default branch (project: {})...", project.getPath());+ var repository = projectManager.getRepository(project.getId());+ try (RevWalk revWalk = new RevWalk(repository);+ TreeWalk treeWalk = new TreeWalk(repository)) {+ var commitId = repository.resolve(GitUtils.branch2ref(defaultBranch));+ treeWalk.addTree(revWalk.parseCommit(commitId).getTree());+ treeWalk.setRecursive(true);+ var codeAnalysisPatterns = project.findCodeAnalysisPatterns();+ var indexVersion = getIndexVersion(codeAnalysisPatterns);+ if (searcher != null) {+ var queryBuilder = new BooleanQueryBuilder();+ queryBuilder.add(META.getTermQuery(LAST_COMMIT.name()), MUST);+ queryBuilder.add(newExactQuery(PROJECT_ID.name(), project.getId()), MUST);+ var topDocs = searcher.search(queryBuilder.build(), 1);+ if (topDocs.scoreDocs.length != 0) {+ var doc = searcher.doc(topDocs.scoreDocs[0].doc);+ String lastCommitIndexVersion = doc.get(LAST_COMMIT_INDEX_VERSION.name());+ queryBuilder = new BooleanQueryBuilder();+ queryBuilder.add(META.getTermQuery(BLOB.name()), MUST);+ queryBuilder.add(newExactQuery(PROJECT_ID.name(), project.getId()), MUST);+ var query = queryBuilder.build();+ if (lastCommitIndexVersion.equals(indexVersion)) {+ String lastCommitHash = doc.get(LAST_COMMIT_HASH.name());+ ObjectId lastCommitId = ObjectId.fromString(lastCommitHash);+ if (repository.getObjectDatabase().has(lastCommitId)) {+ treeWalk.addTree(revWalk.parseCommit(lastCommitId).getTree());+ treeWalk.setFilter(TreeFilter.ANY_DIFF);+ } else {+ writer.deleteDocuments(query);+ }+ } else {+ writer.deleteDocuments(query);+ }+ }+ }++ var patternSet = PatternSet.parse(codeAnalysisPatterns);+ Matcher matcher = new PathMatcher();+ while (treeWalk.next()) {+ var blobPath = treeWalk.getPathString();+ if (patternSet.matches(matcher, blobPath)) {+ if (treeWalk.getTreeCount() != 1) {+ var queryBuilder = new BooleanQueryBuilder();+ queryBuilder = new BooleanQueryBuilder();+ queryBuilder.add(META.getTermQuery(BLOB.name()), MUST);+ queryBuilder.add(newExactQuery(PROJECT_ID.name(), project.getId()), MUST);+ queryBuilder.add(BLOB_PATH.getTermQuery(blobPath), MUST);+ writer.deleteDocuments(queryBuilder.build());+ }++ if ((treeWalk.getRawMode(0) & FileMode.TYPE_MASK) == FileMode.TYPE_FILE) {+ ObjectId blobId = treeWalk.getObjectId(0);+ Document document = new Document();++ document.add(new StringField(META.name(), BLOB.name(), Field.Store.NO));+ document.add(new LongPoint(PROJECT_ID.name(), project.getId()));+ document.add(new StoredField(PROJECT_ID.name(), project.getId()));+ document.add(new StringField(BLOB_PATH.name(), blobPath, Field.Store.YES));+ String blobName = GitUtils.getBlobName(blobPath);++ document.add(new StringField(BLOB_NAME.name(), blobName.toLowerCase(),+ Field.Store.NO));+ document.add(new StoredField(BLOB_HASH.name(), blobId.name()));++ ObjectLoader objectLoader = repository.open(blobId);+ if (objectLoader.getSize() <= MAX_INDEXABLE_BLOB_SIZE) {+ byte[] bytes = objectLoader.getCachedBytes();+ String content = ContentDetector.convertToText(bytes, blobName);+ if (content != null) {+ for (var line: Splitter.on('\n').split(content)) {+ if (line.length() <= MAX_INDEXABLE_LINE_LEN)+ document.add(new TextField(BLOB_TEXT.name(), line, Field.Store.NO));+ }+ SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);+ if (extractor != null) {+ List<Symbol> symbols = null;+ try {+ symbols = extractor.extract(blobName, StringUtils.removeBOM(content));+ } catch (Exception e) {+ logger.trace("Can not extract symbols from blob (hash:" + blobId.name() + ", path:" + blobPath + ")", e);+ }+ if (symbols != null) {+ for (Symbol symbol: symbols) {+ String fieldValue = symbol.getName();+ if (fieldValue != null && symbol.isSearchable()) {+ fieldValue = fieldValue.toLowerCase();++ String fieldName;+ if (symbol.isPrimary())+ fieldName = BLOB_PRIMARY_SYMBOLS.name();+ else+ fieldName = BLOB_SECONDARY_SYMBOLS.name();+ document.add(new StringField(fieldName, fieldValue, Field.Store.NO));+ }+ }+ byte[] bytesOfSymbols = SerializationUtils.serialize((Serializable) symbols);+ document.add(new StoredField(BLOB_SYMBOL_LIST.name(), bytesOfSymbols));+ }+ }+ } else {+ logger.debug("Ignore content of binary file '{}'.", blobPath);+ }+ } else {+ logger.debug("Ignore content of large file '{}'.", blobPath);+ }+ writer.addDocument(document);+ }+ }+ }++ // record last commit so that we only need to indexing changed files for subsequent commits+ var queryBuilder = new BooleanQueryBuilder();+ queryBuilder = new BooleanQueryBuilder();+ queryBuilder.add(META.getTermQuery(LAST_COMMIT.name()), MUST);+ queryBuilder.add(newExactQuery(PROJECT_ID.name(), project.getId()), MUST);+ writer.deleteDocuments(queryBuilder.build());++ Document document = new Document();+ document.add(new StringField(META.name(), LAST_COMMIT.name(), Field.Store.NO));+ document.add(new LongPoint(PROJECT_ID.name(), project.getId()));+ document.add(new StoredField(LAST_COMMIT_INDEX_VERSION.name(), indexVersion));+ document.add(new StoredField(LAST_COMMIT_HASH.name(), commitId.getName()));+ writer.addDocument(document);+ }+ logger.debug("Default branch indexed (project: {})", project.getPath());+ }+ }++ public Object writeReplace() throws ObjectStreamException {+ return new ManagedSerializedForm(CodeIndexManager.class);+ }++ private static class IndexWork extends Prioritized {++ public IndexWork(int priority) {+ super(priority);+ }++ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/DefaultCodeSearchManager.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/DefaultCodeSearchManager.javanew file mode 100644index 0000000000..851697c939--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/DefaultCodeSearchManager.java@@ -0,0 +1,159 @@+package io.onedev.server.ee.xsearch;++import io.onedev.commons.loader.ManagedSerializedForm;+import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.server.OneDev;+import io.onedev.server.cluster.ClusterManager;+import io.onedev.server.cluster.ClusterTask;+import io.onedev.server.ee.xsearch.match.BlobMatch;+import io.onedev.server.ee.xsearch.query.BlobQuery;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.event.Listen;+import io.onedev.server.event.system.SystemStopped;+import io.onedev.server.search.code.query.TooGeneralQueryException;+import org.apache.lucene.document.Document;+import org.apache.lucene.index.DirectoryReader;+import org.apache.lucene.index.LeafReaderContext;+import org.apache.lucene.search.*;+import org.apache.lucene.store.Directory;+import org.apache.lucene.store.FSDirectory;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;+import java.io.File;+import java.io.IOException;+import java.io.ObjectStreamException;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import static java.util.Map.Entry.comparingByKey;++@Singleton+public class DefaultCodeSearchManager implements CodeSearchManager, Serializable {++ private final ClusterManager clusterManager;++ private final ProjectManager projectManager;++ private volatile SearcherManager searcherManager;++ @Inject+ public DefaultCodeSearchManager(ClusterManager clusterManager, ProjectManager projectManager) {+ this.clusterManager = clusterManager;+ this.projectManager = projectManager;+ }++ private File getIndexDir() {+ return new File(OneDev.getIndexDir(), "code");+ }++ @Nullable+ private SearcherManager getSearcherManager() {+ try {+ SearcherManager searcherManagerCopy = searcherManager;+ if (searcherManagerCopy == null) synchronized (this) {+ searcherManagerCopy = searcherManager;+ if (searcherManagerCopy == null && getIndexDir().exists()) {+ Directory directory = FSDirectory.open(getIndexDir().toPath());+ if (DirectoryReader.indexExists(directory)) {+ searcherManagerCopy = new SearcherManager(directory, null);+ searcherManager = searcherManagerCopy;+ }+ }+ }+ return searcherManagerCopy;+ } catch (IOException e) {+ throw ExceptionUtils.unchecked(e);+ }+ }++ @Override+ public List<BlobMatch> search(BlobQuery query) throws TooGeneralQueryException {+ List<BlobMatch> matches = new ArrayList<>();+ var projectIdsByServer = projectManager.groupByActiveServers(query.getApplicableProjectIds());++ var entries = new ArrayList<>(clusterManager.runOnServers(projectIdsByServer.keySet(), (ClusterTask<List<BlobMatch>>) () -> {+ var searcherManager = getSearcherManager();+ if (searcherManager != null) {+ try {+ IndexSearcher searcher = searcherManager.acquire();+ try {+ var innerMatches = new ArrayList<BlobMatch>();+ var projectIds = projectIdsByServer.get(clusterManager.getLocalServerAddress());+ searcher.search(query.asLuceneQuery(projectIds), new SimpleCollector() {++ private LeafReaderContext context;++ @Override+ public void collect(int doc) throws IOException {+ Document document = searcher.doc(context.docBase+doc);+ if (innerMatches.size() < query.getCount()) {+ var match = query.matches(document);+ if (match != null)+ innerMatches.add(match);+ } else {+ throw new CollectionTerminatedException();+ }+ }++ @Override+ protected void doSetNextReader(LeafReaderContext context) throws IOException {+ this.context = context;+ }++ @Override+ public ScoreMode scoreMode() {+ return ScoreMode.COMPLETE_NO_SCORES;+ }++ });+ return innerMatches;+ } finally {+ searcherManager.release(searcher);+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else {+ return new ArrayList<>();+ }+ }).entrySet());++ entries.sort(comparingByKey());+ for (var result: entries)+ matches.addAll(result.getValue());++ if (matches.size() > query.getCount())+ matches = matches.subList(0, query.getCount());+ return matches;+ }++ @Override+ public void indexUpdated() {+ if (searcherManager != null) {+ try {+ searcherManager.maybeRefresh();+ } catch (IOException e) {+ throw ExceptionUtils.unchecked(e);+ }+ }+ }++ @Listen+ public void on(SystemStopped event) {+ if (searcherManager != null) {+ try {+ searcherManager.close();+ } catch (IOException e) {+ throw ExceptionUtils.unchecked(e);+ }+ }+ }++ public Object writeReplace() throws ObjectStreamException {+ return new ManagedSerializedForm(CodeSearchManager.class);+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/FileSearchPage.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/FileSearchPage.javanew file mode 100644index 0000000000..68e6b78e0b--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/FileSearchPage.java@@ -0,0 +1,20 @@+package io.onedev.server.ee.xsearch;++import io.onedev.server.search.code.query.FileQueryOption;+import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.request.mapper.parameter.PageParameters;++public class FileSearchPage extends CodeSearchPage<FileQueryOption> {++ public FileSearchPage(PageParameters params) {+ super(params);+ }++ @Override+ protected Component newTopbarTitle(String componentId) {+ return new Label(componentId, "<div><span>Search Files</span> <span class='font-size-sm text-muted'>in default branch</span></div>")+ .setEscapeModelStrings(false);+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/ProjectsBean.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/ProjectsBean.javanew file mode 100644index 0000000000..cc4038f435--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/ProjectsBean.java@@ -0,0 +1,35 @@+package io.onedev.server.ee.xsearch;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Patterns;+import io.onedev.server.security.permission.ReadCode;+import io.onedev.server.web.util.SuggestionUtils;++import java.io.Serializable;+import java.util.List;++@Editable+public class ProjectsBean implements Serializable {++ private String projects;++ @Editable(name="In Projects", order=100, placeholder="All projects with code read permission", description="" ++ "Optionally specify space-separated projects to search in. Use '**', '*' or '?' " ++ "for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. " ++ "Prefix with '-' to exclude. Leave empty to search in all projects with code read permission")+ @Patterns(suggester="suggestProjects", path=true)+ public String getProjects() {+ return projects;+ }++ public void setProjects(String projects) {+ this.projects = projects;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestProjects(String matchWith) {+ return SuggestionUtils.suggestProjectPaths(matchWith, new ReadCode());+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/SymbolSearchPage.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/SymbolSearchPage.javanew file mode 100644index 0000000000..b5f26c6806--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/SymbolSearchPage.java@@ -0,0 +1,20 @@+package io.onedev.server.ee.xsearch;++import io.onedev.server.search.code.query.SymbolQueryOption;+import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.request.mapper.parameter.PageParameters;++public class SymbolSearchPage extends CodeSearchPage<SymbolQueryOption> {++ public SymbolSearchPage(PageParameters params) {+ super(params);+ }++ @Override+ protected Component newTopbarTitle(String componentId) {+ return new Label(componentId, "<div><span>Search Symbols</span> <span class='font-size-sm text-muted'>in default branch</span></div>")+ .setEscapeModelStrings(false);+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/TextSearchPage.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/TextSearchPage.javanew file mode 100644index 0000000000..0705def32e--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/TextSearchPage.java@@ -0,0 +1,20 @@+package io.onedev.server.ee.xsearch;++import io.onedev.server.search.code.query.TextQueryOption;+import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.request.mapper.parameter.PageParameters;++public class TextSearchPage extends CodeSearchPage<TextQueryOption> {++ public TextSearchPage(PageParameters params) {+ super(params);+ }++ @Override+ protected Component newTopbarTitle(String componentId) {+ return new Label(componentId, "<div><span>Search Text</span> <span class='font-size-sm text-muted'>in default branch</span></div>")+ .setEscapeModelStrings(false);+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/code-search.css b/server-ee/src/main/java/io/onedev/server/ee/xsearch/code-search.cssnew file mode 100644index 0000000000..175e5699a1--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/code-search.css@@ -0,0 +1,3 @@+#code-search .expanded .icon {+ transform: rotate(90deg);+}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/BlobMatch.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/BlobMatch.javanew file mode 100644index 0000000000..625038aeba--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/BlobMatch.java@@ -0,0 +1,34 @@+package io.onedev.server.ee.xsearch.match;++import java.io.Serializable;+import java.util.List;++public class BlobMatch implements Serializable {++ private static final long serialVersionUID = 1L;++ private final Long projectId;++ private final String blobPath;++ private final List<ContentMatch> contentMatches;++ public BlobMatch(Long projectId, String blobPath, List<ContentMatch> contentMatches) {+ this.projectId = projectId;+ this.blobPath = blobPath;+ this.contentMatches = contentMatches;+ }++ public Long getProjectId() {+ return projectId;+ }++ public String getBlobPath() {+ return blobPath;+ }++ public List<ContentMatch> getContentMatches() {+ return contentMatches;+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/ContentMatch.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/ContentMatch.javanew file mode 100644index 0000000000..dd23d4765f--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/ContentMatch.java@@ -0,0 +1,17 @@+package io.onedev.server.ee.xsearch.match;++import io.onedev.commons.utils.PlanarRange;+import org.apache.wicket.Component;+import org.apache.wicket.markup.html.image.Image;++import java.io.Serializable;++public interface ContentMatch extends Serializable {++ Image renderIcon(String componentId);++ Component render(String componentId);++ PlanarRange getPosition();++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/SymbolMatch.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/SymbolMatch.javanew file mode 100644index 0000000000..0015e1edf7--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/SymbolMatch.java@@ -0,0 +1,37 @@+package io.onedev.server.ee.xsearch.match;++import io.onedev.commons.jsymbol.Symbol;+import io.onedev.commons.utils.PlanarRange;+import org.apache.wicket.Component;+import org.apache.wicket.markup.html.image.Image;++public class SymbolMatch implements ContentMatch {++ private static final long serialVersionUID = 1L;++ private final Symbol symbol;++ public SymbolMatch(Symbol symbol) {+ this.symbol = symbol;+ }++ public Symbol getSymbol() {+ return symbol;+ }++ @Override+ public Image renderIcon(String componentId) {+ return symbol.renderIcon(componentId);+ }++ @Override+ public Component render(String componentId) {+ return new SymbolPanel(componentId, symbol);+ }++ @Override+ public PlanarRange getPosition() {+ return symbol.getPosition();+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/SymbolPanel.html b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/SymbolPanel.htmlnew file mode 100644index 0000000000..314acea542--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/SymbolPanel.html@@ -0,0 +1,4 @@+<wicket:panel>+ <span wicket:id="declare"></span>+ <span wicket:id="namespace" class="text-gray"></span>+</wicket:panel>\ No newline at end of filediff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/SymbolPanel.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/SymbolPanel.javanew file mode 100644index 0000000000..4aa803c3f1--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/SymbolPanel.java@@ -0,0 +1,38 @@+package io.onedev.server.ee.xsearch.match;++import io.onedev.commons.jsymbol.Symbol;+import io.onedev.commons.utils.LinearRange;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.LoadableDetachableModel;++public class SymbolPanel extends Panel {++ private final Symbol symbol;++ public SymbolPanel(String id, Symbol symbol) {+ super(id);+ this.symbol = symbol;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(symbol.render("declare", new LinearRange(0, symbol.getName().length())));+ add(new Label("namespace", new LoadableDetachableModel<String>() {+ @Override+ protected String load() {+ if (symbol.getParent() != null)+ return symbol.getParent().getFQN();+ else+ return null;+ }+ }) {+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getDefaultModelObject() != null);+ }+ });+ }+}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/TextMatch.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/TextMatch.javanew file mode 100644index 0000000000..a5c7773a89--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/TextMatch.java@@ -0,0 +1,39 @@+package io.onedev.server.ee.xsearch.match;++import io.onedev.commons.jsymbol.util.HighlightableLabel;+import io.onedev.commons.jsymbol.util.NoAntiCacheImage;+import io.onedev.commons.utils.LinearRange;+import io.onedev.commons.utils.PlanarRange;+import org.apache.wicket.Component;+import org.apache.wicket.markup.html.image.Image;+import org.apache.wicket.request.resource.PackageResourceReference;++public class TextMatch implements ContentMatch {++ private static final long serialVersionUID = 1L;++ private final PlanarRange position;++ private final String line;++ public TextMatch(PlanarRange position, String line) {+ this.position = position;+ this.line = line;+ }++ @Override+ public Component render(String componentId) {+ return new HighlightableLabel(componentId, line,+ new LinearRange(position.getFromColumn(), position.getToColumn()));+ }++ @Override+ public Image renderIcon(String componentId) {+ return new NoAntiCacheImage(componentId, new PackageResourceReference(TextMatch.class, "bullet.png"));+ }++ public PlanarRange getPosition() {+ return position;+ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/bullet.png b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/bullet.pngnew file mode 100644index 0000000000..eba45fa640Binary files /dev/null and b/server-ee/src/main/java/io/onedev/server/ee/xsearch/match/bullet.png differdiff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/query/BlobQuery.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/query/BlobQuery.javanew file mode 100644index 0000000000..ac9e478e2e--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/query/BlobQuery.java@@ -0,0 +1,83 @@+package io.onedev.server.ee.xsearch.query;++import io.onedev.server.OneDev;+import io.onedev.server.ee.xsearch.match.BlobMatch;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.AbstractEntity;+import io.onedev.server.search.code.query.TooGeneralQueryException;+import io.onedev.server.security.permission.ReadCode;+import io.onedev.server.util.patternset.PatternSet;+import org.apache.lucene.document.Document;+import org.apache.lucene.search.BooleanClause.Occur;+import org.apache.lucene.search.BooleanQuery;+import org.apache.lucene.search.Query;++import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.Collection;++import static io.onedev.server.search.code.FieldConstants.PROJECT_ID;+import static io.onedev.server.util.criteria.Criteria.forManyValues;+import static io.onedev.server.util.patternset.PatternSet.parse;+import static java.util.stream.Collectors.toSet;++public abstract class BlobQuery implements Serializable {++ private static final long serialVersionUID = 1L;++ private final String projects;++ private final int count;++ public BlobQuery(@Nullable String projects, int count) {+ this.projects = projects;+ this.count = count;+ }++ @Nullable+ public String getProjects() {+ return projects;+ }++ public int getCount() {+ return count;+ }++ private ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ /**+ * Get lucene query representation of this query+ *+ * @return+ * lucene query+ * @throws+ * TooGeneralQueryException if supplied query term is too general to possibly cause query slow+ */+ public Query asLuceneQuery(Collection<Long> projectIds) throws TooGeneralQueryException {+ BooleanQuery.Builder luceneQueryBuilder = new BooleanQuery.Builder();+ var allIds = getProjectManager().getIds();+ luceneQueryBuilder.add(forManyValues(PROJECT_ID.name(), projectIds, allIds), Occur.MUST);++ applyConstraints(luceneQueryBuilder);++ return luceneQueryBuilder.build();+ }++ public Collection<Long> getApplicableProjectIds() {+ var projectManager = OneDev.getInstance(ProjectManager.class);+ Collection<Long> projectIds = projectManager.getPermittedProjects(new ReadCode())+ .stream().map(AbstractEntity::getId).collect(toSet());+ if (projects != null)+ projectIds.retainAll(projectManager.getPathMatchingIds(parse(projects)));++ return projectIds;+ }++ protected abstract void applyConstraints(BooleanQuery.Builder query);++ @Nullable+ public abstract BlobMatch matches(Document document);++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/query/FileQuery.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/query/FileQuery.javanew file mode 100644index 0000000000..a13c78e0f8--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/query/FileQuery.java@@ -0,0 +1,95 @@+package io.onedev.server.ee.xsearch.query;++import com.google.common.base.Preconditions;+import io.onedev.server.ee.xsearch.match.BlobMatch;+import io.onedev.server.search.code.query.FileQueryOption;+import org.apache.lucene.document.Document;+import org.apache.lucene.search.BooleanQuery;++import javax.annotation.Nullable;+import java.util.ArrayList;+import java.util.List;++import static io.onedev.server.git.GitUtils.getBlobName;+import static io.onedev.server.search.code.FieldConstants.*;++public class FileQuery extends BlobQuery {++ private static final long serialVersionUID = 1L;++ private final String term;++ private final boolean caseSensitive;++ private FileQuery(String term, boolean caseSensitive, @Nullable String projects, int count) {+ super(projects, count);++ this.term = term;+ this.caseSensitive = caseSensitive;+ }++ @Override+ protected void applyConstraints(BooleanQuery.Builder builder) {+ getOption().applyConstraints(builder);+ }++ @Override+ public BlobMatch matches(Document document) {+ var projectId = document.getField(PROJECT_ID.name()).numericValue().longValue();+ var blobPath = document.getField(BLOB_PATH.name()).stringValue();+ String blobName = getBlobName(blobPath);+ var match = getOption().matches(blobName, null);+ if (match != null)+ return new BlobMatch(projectId, blobPath, new ArrayList<>());+ else+ return null;+ }++ private FileQueryOption getOption() {+ return new FileQueryOption(term, caseSensitive);+ }++ public static class Builder {++ private boolean caseSensitive;++ private final String term;++ protected String projects;++ protected int count;++ public Builder(String term) {+ this.term = term;+ }++ public Builder(FileQueryOption option) {+ this(option.getTerm());+ caseSensitive(option.isCaseSensitive());+ }++ public Builder caseSensitive(boolean caseSensitive) {+ this.caseSensitive = caseSensitive;+ return this;+ }++ public Builder projects(@Nullable String projects) {+ this.projects = projects;+ return this;+ }++ public Builder count(int count) {+ this.count = count;+ return this;+ }++ public BlobQuery build() {+ Preconditions.checkState(term !=null);+ Preconditions.checkState(count!=0);++ return new FileQuery(term, caseSensitive, projects, count);+ }++ }++}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/query/SymbolQuery.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/query/SymbolQuery.javanew file mode 100644index 0000000000..7a2e30e648--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/query/SymbolQuery.java@@ -0,0 +1,137 @@+package io.onedev.server.ee.xsearch.query;++import com.google.common.base.Preconditions;+import io.onedev.commons.jsymbol.Symbol;+import io.onedev.server.ee.xsearch.match.BlobMatch;+import io.onedev.server.ee.xsearch.match.ContentMatch;+import io.onedev.server.ee.xsearch.match.SymbolMatch;+import io.onedev.server.search.code.query.SymbolQueryOption;+import org.apache.commons.lang3.SerializationUtils;+import org.apache.lucene.document.Document;+import org.apache.lucene.search.BooleanQuery;+import org.apache.lucene.util.BytesRef;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import javax.annotation.Nullable;+import java.util.ArrayList;+import java.util.List;++import static io.onedev.server.search.code.FieldConstants.*;++public class SymbolQuery extends BlobQuery {++ private static final long serialVersionUID = 1L;++ private static final Logger logger = LoggerFactory.getLogger(SymbolQuery.class);++ private final String term;++ private final boolean caseSensitive;++ private final String fileNames;++ private final Boolean primary;++ private SymbolQuery(String term, boolean caseSensitive, @Nullable String fileNames,+ @Nullable Boolean primary, @Nullable String projects, int count) {+ super(projects, count);++ this.term = term;+ this.caseSensitive = caseSensitive;+ this.fileNames = fileNames;+ this.primary = primary;+ }++ @Override+ protected void applyConstraints(BooleanQuery.Builder builder) {+ getOption().applyConstraints(builder, primary);+ }++ @Override+ public BlobMatch matches(Document document) {+ var projectId = document.getField(PROJECT_ID.name()).numericValue().longValue();+ var blobPath = document.getField(BLOB_PATH.name()).stringValue();+ List<Symbol> symbols = null;+ BytesRef bytesRef = document.getBinaryValue(BLOB_SYMBOL_LIST.name());+ if (bytesRef != null) {+ try {+ symbols = SerializationUtils.deserialize(bytesRef.bytes);+ } catch (Exception e) {+ logger.error("Error deserializing symbols", e);+ }+ }++ if (symbols != null) {+ var symbolMatches = new ArrayList<ContentMatch>();+ for (var match: getOption().matches(blobPath, symbols, null, null,+ primary, null, Integer.MAX_VALUE)) {+ symbolMatches.add(new SymbolMatch(match.getSymbol()));+ }+ if (!symbolMatches.isEmpty())+ return new BlobMatch(projectId, blobPath, symbolMatches);+ }+ return null;+ }++ private SymbolQueryOption getOption() {+ return new SymbolQueryOption(term, caseSensitive, fileNames);+ }++ public static class Builder {++ private final String term;++ private boolean caseSensitive;++ private String fileNames;++ private Boolean primary;++ private String projects;++ private int count;++ public Builder(String term) {+ this.term = term;+ }++ public Builder(SymbolQueryOption option) {+ this(option.getTerm());+ caseSensitive(option.isCaseSensitive());+ fileNames(option.getFileNames());+ }++ public Builder caseSensitive(boolean caseSensitive) {+ this.caseSensitive = caseSensitive;+ return this;+ }++ public Builder fileNames(String fileNames) {+ this.fileNames = fileNames;+ return this;+ }++ public Builder primary(@Nullable Boolean primary) {+ this.primary = primary;+ return this;+ }++ public Builder projects(@Nullable String projects) {+ this.projects = projects;+ return this;+ }++ public Builder count(int count) {+ this.count = count;+ return this;+ }++ public BlobQuery build() {+ Preconditions.checkState(term!=null);+ Preconditions.checkState(count!=0);+ return new SymbolQuery(term, caseSensitive, fileNames, primary, projects, count);+ }++ }+}diff --git a/server-ee/src/main/java/io/onedev/server/ee/xsearch/query/TextQuery.java b/server-ee/src/main/java/io/onedev/server/ee/xsearch/query/TextQuery.javanew file mode 100644index 0000000000..82c7dff926--- /dev/null+++ b/server-ee/src/main/java/io/onedev/server/ee/xsearch/query/TextQuery.java@@ -0,0 +1,146 @@+package io.onedev.server.ee.xsearch.query;++import com.google.common.base.Preconditions;+import io.onedev.server.OneDev;+import io.onedev.server.ee.xsearch.match.BlobMatch;+import io.onedev.server.ee.xsearch.match.ContentMatch;+import io.onedev.server.ee.xsearch.match.TextMatch;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.search.code.query.TextQueryOption;+import org.apache.lucene.document.Document;+import org.apache.lucene.search.BooleanQuery;+import org.eclipse.jgit.lib.ObjectId;++import javax.annotation.Nullable;+import java.io.IOException;+import java.util.ArrayList;+import java.util.regex.Pattern;++import static io.onedev.server.search.code.FieldConstants.*;++public class TextQuery extends BlobQuery {++ private static final long serialVersionUID = 1L;++ private final String term;++ private final boolean regex;++ private final boolean wholeWord;++ private final boolean caseSensitive;++ private final String fileNames;++ private transient Pattern pattern;++ private TextQuery(String term, boolean regex, boolean wholeWord, boolean caseSensitive,+ @Nullable String fileNames, @Nullable String projects, int count) {+ super(projects, count);++ this.term = term;+ this.regex = regex;+ this.wholeWord = wholeWord;+ this.caseSensitive = caseSensitive;+ this.fileNames = fileNames;+ }++ @Override+ protected void applyConstraints(BooleanQuery.Builder builder) {+ getOption().applyConstraints(builder);+ }++ @Override+ public BlobMatch matches(Document document) {+ var projectId = document.getField(PROJECT_ID.name()).numericValue().longValue();+ var blobHash = document.getField(BLOB_HASH.name()).stringValue();+ var blobPath = document.getField(BLOB_PATH.name()).stringValue();+ var repository = OneDev.getInstance(ProjectManager.class).getRepository(projectId);+ try (var objectReader = repository.newObjectReader()) {+ try {+ var objectLoader = objectReader.open(ObjectId.fromString(blobHash));+ var textMatches = new ArrayList<ContentMatch>();+ for (var match: getOption().matches(blobPath, objectLoader, Integer.MAX_VALUE))+ textMatches.add(new TextMatch(match.getPosition(), match.getLine()));+ if (!textMatches.isEmpty())+ return new BlobMatch(projectId, blobPath, textMatches);+ else+ return null;+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }++ private TextQueryOption getOption() {+ return new TextQueryOption(term, regex, wholeWord, caseSensitive, fileNames);+ }++ public static class Builder {++ private final String term;++ private boolean regex;++ private boolean wholeWord;++ private boolean caseSensitive;++ private String fileNames;++ private String projects;++ private int count;++ public Builder(String term) {+ this.term = term;+ }++ public Builder(TextQueryOption option) {+ this(option.getTerm());+ regex(option.isRegex());+ wholeWord(option.isWholeWord());+ caseSensitive(option.isCaseSensitive());+ fileNames(option.getFileNames());+ }++ public Builder regex(boolean regex) {+ this.regex = regex;+ return this;+ }++ public Builder wholeWord(boolean wholeWord) {+ this.wholeWord = wholeWord;+ return this;+ }++ public Builder caseSensitive(boolean caseSensitive) {+ this.caseSensitive = caseSensitive;+ return this;+ }++ public Builder fileNames(String fileNames) {+ this.fileNames = fileNames;+ return this;+ }++ public Builder projects(@Nullable String projects) {+ this.projects = projects;+ return this;+ }++ public Builder count(int count) {+ this.count = count;+ return this;+ }++ public BlobQuery build() {+ Preconditions.checkState(term != null);+ Preconditions.checkState(count != 0);++ return new TextQuery(term, regex, wholeWord, caseSensitive, fileNames, projects, count);+ }++ }++}diff --git a/server-ee/src/test/java/io/onedev/server/ee/clustering/EEClusterManagerTest.java b/server-ee/src/test/java/io/onedev/server/ee/clustering/EEClusterManagerTest.javanew file mode 100644index 0000000000..2d175da9b6--- /dev/null+++ b/server-ee/src/test/java/io/onedev/server/ee/clustering/EEClusterManagerTest.java@@ -0,0 +1,228 @@+package io.onedev.server.ee.clustering;++import io.onedev.server.ServerConfig;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.event.ListenerRegistry;+import io.onedev.server.model.support.administration.ClusterSetting;+import io.onedev.server.persistence.PersistenceManager;+import io.onedev.server.persistence.HibernateConfig;+import io.onedev.server.replica.ProjectReplica;+import junit.framework.TestCase;++import java.util.*;++import static io.onedev.server.replica.ProjectReplica.Type.*;+import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.when;++public class EEClusterManagerTest extends TestCase {++ public void testRedistributeProjects() {+ var serverConfig = mock(ServerConfig.class);+ var listenerRegistry = mock(ListenerRegistry.class);+ var persistenceManager = mock(PersistenceManager.class);+ var hibernateConfig = mock(HibernateConfig.class);+ var settingManager = mock(SettingManager.class);++ var clusterSetting = new ClusterSetting();+ when(settingManager.getClusterSetting()).thenReturn(clusterSetting);++ var servers = new ArrayList<String>();+ var clusterManager = new EEClusterManager(serverConfig, persistenceManager, settingManager,+ listenerRegistry, hibernateConfig) {+ @Override+ public List<String> getServerAddresses() {+ return servers;+ }+ };++ String server0 = "server0";+ String server1 = "server1";+ String server2 = "server2";++ servers.add(server1);+ servers.add(server2);++ Map<Long, LinkedHashMap<String, ProjectReplica>> replicas = new LinkedHashMap<>();++ LinkedHashMap<String, ProjectReplica> replicasOfProject = new LinkedHashMap<>();++ var replica = new ProjectReplica();+ replica.setType(BACKUP);+ replica.setVersion(1);+ replicasOfProject.put("server0", replica);++ replica = new ProjectReplica();+ replica.setType(PRIMARY);+ replica.setVersion(1);+ replicasOfProject.put("server1", replica);++ replica = new ProjectReplica();+ replica.setType(BACKUP);+ replica.setVersion(1);+ replicasOfProject.put("server2", replica);++ replicas.put(1L, replicasOfProject);++ replicasOfProject = new LinkedHashMap<>();++ replica = new ProjectReplica();+ replica.setType(BACKUP);+ replica.setVersion(1);+ replicasOfProject.put("server1", replica);++ replica = new ProjectReplica();+ replica.setType(PRIMARY);+ replica.setVersion(1);+ replicasOfProject.put("server2", replica);++ replicas.put(2L, replicasOfProject);++ clusterSetting.setReplicaCount(1);+ clusterManager.redistributeProjects(replicas);+ assertEquals(BACKUP, replicas.get(1L).get(server0).getType());+ assertEquals(PRIMARY, replicas.get(1L).get(server1).getType());+ assertEquals(REDUNDANT, replicas.get(1L).get(server2).getType());+ assertEquals(REDUNDANT, replicas.get(2L).get(server1).getType());+ assertEquals(PRIMARY, replicas.get(2L).get(server2).getType());++ replicas = new LinkedHashMap<>();++ replica = new ProjectReplica();+ replica.setVersion(1);+ replica.setType(PRIMARY);+ replicasOfProject = new LinkedHashMap<>();+ replicasOfProject.put(server1, replica);+ replicas.put(1L, replicasOfProject);++ replica = new ProjectReplica();+ replica.setVersion(1);+ replica.setType(PRIMARY);+ replicasOfProject = new LinkedHashMap<>();+ replicasOfProject.put(server1, replica);+ replicas.put(2L, replicasOfProject);++ clusterManager.redistributeProjects(replicas);+ assertEquals(REDUNDANT, replicas.get(1L).get(server1).getType());+ assertEquals(PRIMARY, replicas.get(1L).get(server2).getType());+ assertEquals(PRIMARY, replicas.get(2L).get(server1).getType());++ clusterSetting.setReplicaCount(2);+ clusterManager.redistributeProjects(replicas);+ assertEquals(BACKUP, replicas.get(1L).get(server1).getType());+ assertEquals(PRIMARY, replicas.get(1L).get(server2).getType());+ assertEquals(PRIMARY, replicas.get(2L).get(server1).getType());+ assertEquals(BACKUP, replicas.get(2L).get(server2).getType());++ replica = new ProjectReplica();+ replica.setVersion(1);+ replica.setType(PRIMARY);+ replicasOfProject = new LinkedHashMap<>();+ replicasOfProject.put(server1, replica);+ replicas.put(3L, replicasOfProject);++ replica = new ProjectReplica();+ replica.setVersion(1);+ replica.setType(PRIMARY);+ replicasOfProject = new LinkedHashMap<>();+ replicasOfProject.put(server2, replica);+ replicas.put(4L, replicasOfProject);++ String server3 = "server3";+ servers.add(server3);+ clusterManager.redistributeProjects(replicas);+ assertEquals(PRIMARY, replicas.get(1L).get(server1).getType());+ assertEquals(REDUNDANT, replicas.get(1L).get(server2).getType());+ assertEquals(BACKUP, replicas.get(1L).get(server3).getType());+ assertEquals(REDUNDANT, replicas.get(2L).get(server1).getType());+ assertEquals(BACKUP, replicas.get(2L).get(server2).getType());+ assertEquals(PRIMARY, replicas.get(2L).get(server3).getType());+ assertEquals(PRIMARY, replicas.get(3L).get(server1).getType());+ assertEquals(BACKUP, replicas.get(3L).get(server2).getType());+ assertEquals(BACKUP, replicas.get(4L).get(server1).getType());+ assertEquals(PRIMARY, replicas.get(4L).get(server2).getType());++ replicasOfProject = new LinkedHashMap<>();++ replica = new ProjectReplica();+ replica.setVersion(1);+ replica.setType(BACKUP);+ replicasOfProject.put(server0, replica);++ replica = new ProjectReplica();+ replica.setVersion(1);+ replica.setType(PRIMARY);+ replicasOfProject.put(server1, replica);++ replicas.put(5L, replicasOfProject);++ replica = new ProjectReplica();+ replica.setVersion(1);+ replica.setType(PRIMARY);+ replicasOfProject = new LinkedHashMap<>();+ replicasOfProject.put(server1, replica);+ replicas.put(6L, replicasOfProject);+ clusterManager.redistributeProjects(replicas);+ assertEquals(PRIMARY, replicas.get(1L).get(server1).getType());+ assertEquals(REDUNDANT, replicas.get(1L).get(server2).getType());+ assertEquals(BACKUP, replicas.get(1L).get(server3).getType());+ assertEquals(REDUNDANT, replicas.get(2L).get(server1).getType());+ assertEquals(PRIMARY, replicas.get(2L).get(server2).getType());+ assertEquals(BACKUP, replicas.get(2L).get(server3).getType());+ assertEquals(REDUNDANT, replicas.get(3L).get(server1).getType());+ assertEquals(BACKUP, replicas.get(3L).get(server2).getType());+ assertEquals(PRIMARY, replicas.get(3L).get(server3).getType());+ assertEquals(BACKUP, replicas.get(4L).get(server1).getType());+ assertEquals(REDUNDANT, replicas.get(4L).get(server2).getType());+ assertEquals(PRIMARY, replicas.get(4L).get(server3).getType());+ assertEquals(BACKUP, replicas.get(5L).get(server0).getType());+ assertEquals(BACKUP, replicas.get(5L).get(server1).getType());+ assertEquals(PRIMARY, replicas.get(5L).get(server2).getType());+ assertEquals(PRIMARY, replicas.get(6L).get(server1).getType());+ assertEquals(BACKUP, replicas.get(6L).get(server2).getType());++ String server4 = "server4";+ servers.add(server4);++ clusterSetting.setReplicaCount(3);+ clusterManager.redistributeProjects(replicas);+ assertEquals(BACKUP, replicas.get(1L).get(server1).getType());+ assertEquals(REDUNDANT, replicas.get(1L).get(server2).getType());+ assertEquals(BACKUP, replicas.get(1L).get(server3).getType());+ assertEquals(PRIMARY, replicas.get(1L).get(server4).getType());+ assertEquals(REDUNDANT, replicas.get(2L).get(server1).getType());+ assertEquals(PRIMARY, replicas.get(2L).get(server2).getType());+ assertEquals(BACKUP, replicas.get(2L).get(server3).getType());+ assertEquals(BACKUP, replicas.get(2L).get(server4).getType());+ assertEquals(REDUNDANT, replicas.get(3L).get(server1).getType());+ assertEquals(BACKUP, replicas.get(3L).get(server2).getType());+ assertEquals(PRIMARY, replicas.get(3L).get(server3).getType());+ assertEquals(BACKUP, replicas.get(3L).get(server4).getType());+ assertEquals(BACKUP, replicas.get(4L).get(server1).getType());+ assertEquals(BACKUP, replicas.get(4L).get(server2).getType());+ assertEquals(REDUNDANT, replicas.get(4L).get(server3).getType());+ assertEquals(PRIMARY, replicas.get(4L).get(server4).getType());+ assertEquals(BACKUP, replicas.get(5L).get(server1).getType());+ assertEquals(PRIMARY, replicas.get(5L).get(server2).getType());+ assertEquals(BACKUP, replicas.get(5L).get(server3).getType());+ assertEquals(PRIMARY, replicas.get(6L).get(server1).getType());+ assertEquals(BACKUP, replicas.get(6L).get(server2).getType());+ assertEquals(BACKUP, replicas.get(6L).get(server3).getType());++ servers.remove(server1);+ servers.remove(server2);+ clusterManager.redistributeProjects(replicas);+ assertEquals(BACKUP, replicas.get(1L).get(server3).getType());+ assertEquals(PRIMARY, replicas.get(1L).get(server4).getType());+ assertEquals(BACKUP, replicas.get(2L).get(server3).getType());+ assertEquals(PRIMARY, replicas.get(2L).get(server4).getType());+ assertEquals(PRIMARY, replicas.get(3L).get(server3).getType());+ assertEquals(BACKUP, replicas.get(3L).get(server4).getType());+ assertEquals(BACKUP, replicas.get(4L).get(server3).getType());+ assertEquals(PRIMARY, replicas.get(4L).get(server4).getType());+ assertEquals(PRIMARY, replicas.get(5L).get(server3).getType());+ assertEquals(BACKUP, replicas.get(5L).get(server4).getType());+ assertEquals(PRIMARY, replicas.get(6L).get(server3).getType());+ assertEquals(BACKUP, replicas.get(6L).get(server4).getType());+ }+}\ No newline at end of filediff --git a/server-plugin/server-plugin-report-junit/src/test/java/io/onedev/server/plugin/report/junit/JUnitReportParserTest.java b/server-plugin/server-plugin-report-junit/src/test/java/io/onedev/server/plugin/report/junit/JUnitReportParserTest.javaindex e6b02404c1..62e0777ec7 100644--- a/server-plugin/server-plugin-report-junit/src/test/java/io/onedev/server/plugin/report/junit/JUnitReportParserTest.java+++ b/server-plugin/server-plugin-report-junit/src/test/java/io/onedev/server/plugin/report/junit/JUnitReportParserTest.java@@ -8,8 +8,8 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.plugin.report.unittest.UnitTestReport;import io.onedev.server.plugin.report.unittest.UnitTestReport.Status;-import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.CodeSearchManager;+import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.query.BlobQuery;import io.onedev.server.search.code.query.TooGeneralQueryException;import org.apache.lucene.search.IndexSearcher;@@ -35,7 +35,7 @@ public class JUnitReportParserTest extends AppLoaderMocker {@Overridepublic List<QueryHit> search(Project project, ObjectId commit, BlobQuery query)- throws InterruptedException, TooGeneralQueryException {+ throws TooGeneralQueryException {return null;}@@ -79,7 +79,7 @@ public class JUnitReportParserTest extends AppLoaderMocker {@Overridepublic List<QueryHit> search(Project project, ObjectId commit, BlobQuery query)- throws InterruptedException, TooGeneralQueryException {+ throws TooGeneralQueryException {return null;}diff --git a/server-product/pom.xml b/server-product/pom.xmlindex e1888efcfd..3f81ce596e 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -160,6 +160,11 @@<artifactId>server-plugin-notification-discord</artifactId><version>${project.version}</version></dependency>+ <dependency>+ <groupId>io.onedev</groupId>+ <artifactId>server-ee</artifactId>+ <version>${project.version}</version>+ </dependency><!-- Add explicit dependencies to make sure standalone plugins use expected lib version --><dependency><groupId>commons-codec</groupId>