The Unified and Autonomous Development Platform
Fix issue #236 - Slack integration
Robin Shen7f6baae0e55f
diff --git a/pom.xml b/pom.xmlindex 6268343997..4a64d1aae0 100644--- a/pom.xml+++ b/pom.xml@@ -339,11 +339,6 @@<artifactId>javax.mail</artifactId><version>1.6.2</version></dependency>- <dependency>- <groupId>commons-httpclient</groupId>- <artifactId>commons-httpclient</artifactId>- <version>3.1</version>- </dependency><dependency><groupId>joda-time</groupId><artifactId>joda-time</artifactId>@@ -569,6 +564,11 @@<artifactId>agent</artifactId><version>${agent.version}</version></dependency>+ <dependency>+ <groupId>com.slack.api</groupId>+ <artifactId>slack-api-client</artifactId>+ <version>1.25.0</version>+ </dependency></dependencies></dependencyManagement><repositories>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex f46d1e077c..d188ee6220 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -60,10 +60,6 @@<groupId>com.sun.mail</groupId><artifactId>javax.mail</artifactId></dependency>- <dependency>- <groupId>commons-httpclient</groupId>- <artifactId>commons-httpclient</artifactId>- </dependency><dependency><groupId>joda-time</groupId><artifactId>joda-time</artifactId>diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex ec21e2c850..aea230a80d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -814,34 +814,27 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizLong projectId = event.getProject().getId();// run asynchrously as session may get closed due to exception- transactionManager.runAfterCommit(new Runnable() {+ sessionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- sessionManager.runAsync(new Runnable() {-- @Override- public void run() {- SecurityUtils.bindAsSystem();- Project project = projectManager.load(projectId);- try {- new MatrixRunner<List<String>>(paramMatrix) {-- @Override- public void run(Map<String, List<String>> paramMap) {- submit(project, commitId, job.getName(), paramMap,- pipeline, match.getReason());- }-- }.run();- } catch (Throwable e) {- String message = String.format("Error submitting build (project: %s, commit: %s, job: %s)",- project.getPath(), commitId.name(), job.getName());- logger.error(message, e);+ SecurityUtils.bindAsSystem();+ Project project = projectManager.load(projectId);+ try {+ new MatrixRunner<List<String>>(paramMatrix) {++ @Override+ public void run(Map<String, List<String>> paramMap) {+ submit(project, commitId, job.getName(), paramMap,+ pipeline, match.getReason());}- }-- });++ }.run();+ } catch (Throwable e) {+ String message = String.format("Error submitting build (project: %s, commit: %s, job: %s)",+ project.getPath(), commitId.name(), job.getName());+ logger.error(message, e);+ }}});@@ -1016,19 +1009,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Listenpublic void on(ProjectCreated event) {Long projectId = event.getProject().getId();- transactionManager.runAfterCommit(new Runnable() {+ sessionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- sessionManager.runAsync(new Runnable() {-- @Override- public void run() {- Project project = projectManager.load(projectId);- schedule(project);- }-- });+ Project project = projectManager.load(projectId);+ schedule(project);}});@@ -1238,40 +1224,34 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizBuild build = event.getBuild();Long buildId = build.getId();- OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {+ sessionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {-- @Override- public void run() {- Build build = OneDev.getInstance(BuildManager.class).load(buildId);- JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());- Build.push(build);- try {- VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());- Map<String, String> placeholderValues = new HashMap<>();- placeholderValues.put(BUILD_VERSION, build.getVersion());- if (build.getJob() != null) {- for (PostBuildAction action: build.getJob().getPostBuildActions()) {- action = interpolator.interpolateProperties(action);- if (ActionCondition.parse(build.getJob(), action.getCondition()).matches(build))- action.execute(build);- }- } else {- throw new ExplicitException("Job not found");- }- } catch (Throwable e) {- String message = String.format("Error processing post build actions (project: %s, commit: %s, job: %s)",- build.getProject().getPath(), build.getCommitHash(), build.getJobName());- logger.error(message, e);- } finally {- Build.pop();- JobSecretAuthorizationContext.pop();+ Build build = OneDev.getInstance(BuildManager.class).load(buildId);+ JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());+ Build.push(build);+ try {+ VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());+ Map<String, String> placeholderValues = new HashMap<>();+ placeholderValues.put(BUILD_VERSION, build.getVersion());+ if (build.getJob() != null) {+ for (PostBuildAction action: build.getJob().getPostBuildActions()) {+ action = interpolator.interpolateProperties(action);+ if (ActionCondition.parse(build.getJob(), action.getCondition()).matches(build))+ action.execute(build);}+ } else {+ throw new ExplicitException("Job not found");}- });+ } catch (Throwable e) {+ String message = String.format("Error processing post build actions (project: %s, commit: %s, job: %s)",+ build.getProject().getPath(), build.getCommitHash(), build.getJobName());+ logger.error(message, e);+ } finally {+ Build.pop();+ JobSecretAuthorizationContext.pop();+ }}});diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.javaindex 2cadda825a..4f793bfd28 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java@@ -157,18 +157,11 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>if (isNew && settingManager.getMailSetting() != null && !emailAddress.isVerified()) {Long addressId = emailAddress.getId();- transactionManager.runAfterCommit(new Runnable() {+ sessionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- sessionManager.runAsync(new Runnable() {-- @Override- public void run() {- sendVerificationEmail(load(addressId));- }-- });+ sendVerificationEmail(load(addressId));}});diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex f660921d58..0ce762f27c 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -8,8 +8,6 @@ import java.util.Iterator;import java.util.List;import java.util.Map;import java.util.Set;-import java.util.concurrent.Callable;-import java.util.concurrent.ExecutorService;import javax.annotation.Nullable;import javax.inject.Inject;@@ -128,8 +126,6 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>private final IssueLinkManager issueLinkManager;- private final ExecutorService executorService;-private final ListenerRegistry listenerRegistry;private final TaskScheduler taskScheduler;@@ -140,10 +136,9 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>public DefaultIssueChangeManager(Dao dao, TransactionManager transactionManager,IssueManager issueManager, IssueFieldManager issueFieldManager,ProjectManager projectManager, BuildManager buildManager,- ExecutorService executorService, PullRequestManager pullRequestManager,- ListenerRegistry listenerRegistry, TaskScheduler taskScheduler,- IssueScheduleManager issueScheduleManager, IssueLinkManager issueLinkManager,- SessionManager sessionManager) {+ PullRequestManager pullRequestManager, ListenerRegistry listenerRegistry,+ TaskScheduler taskScheduler, IssueScheduleManager issueScheduleManager,+ IssueLinkManager issueLinkManager, SessionManager sessionManager) {super(dao);this.issueManager = issueManager;this.issueFieldManager = issueFieldManager;@@ -151,7 +146,6 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>this.projectManager = projectManager;this.pullRequestManager = pullRequestManager;this.buildManager = buildManager;- this.executorService = executorService;this.listenerRegistry = listenerRegistry;this.taskScheduler = taskScheduler;this.issueScheduleManager = issueScheduleManager;@@ -174,18 +168,11 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>}Long changeId = change.getId();- transactionManager.runAfterCommit(new Runnable() {+ sessionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- sessionManager.runAsync(new Runnable() {-- @Override- public void run() {- listenerRegistry.post(new IssueChanged(load(changeId), note));- }-- });+ listenerRegistry.post(new IssueChanged(load(changeId), note));}});@@ -344,71 +331,53 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>Long issueId = event.getIssue().getId();Long projectId = event.getIssue().getProject().getId();- transactionManager.runAfterCommit(new Runnable() {+ transactionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- executorService.execute(new Runnable() {-- @Override- public void run() {- LockUtils.call(getLockKey(projectId), new Callable<Void>() {-- @Override- public Void call() throws Exception {- transactionManager.run(new Runnable() {-- @Override- public void run() {- try {- SecurityUtils.bindAsSystem();- Issue issue = issueManager.load(issueId);-- IssueQueryParseOption option = new IssueQueryParseOption().withCurrentIssueCriteria(true);- for (TransitionSpec transition: getTransitionSpecs()) {- if (transition.getTrigger() instanceof StateTransitionTrigger) {- Project project = issue.getProject();- ProjectScope projectScope = new ProjectScope(project, true, true);- StateTransitionTrigger trigger = (StateTransitionTrigger) transition.getTrigger();- if (trigger.getStates().contains(issue.getState())) {- IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), option, true);- List<Criteria<Issue>> criterias = new ArrayList<>();-- List<Criteria<Issue>> fromStateCriterias = new ArrayList<>();- for (String fromState: transition.getFromStates())- fromStateCriterias.add(new StateCriteria(fromState, IssueQueryLexer.Is));-- criterias.add(Criteria.orCriterias(fromStateCriterias));- if (query.getCriteria() != null)- criterias.add(query.getCriteria());- query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());- Issue.push(issue);- try {- for (Issue each: issueManager.query(- projectScope, query, true, 0, Integer.MAX_VALUE)) {- String message = "State changed as issue #" + issue.getNumber()- + " transited to '" + issue.getState() + "'";- changeState(each, transition.getToState(), new HashMap<>(),- transition.getRemoveFields(), message);- }- } finally {- Issue.pop();- }- }- }- }- } catch (Exception e) {- logger.error("Error changing issue state", e);- }+ try {+ SecurityUtils.bindAsSystem();+ Issue issue = issueManager.load(issueId);++ IssueQueryParseOption option = new IssueQueryParseOption().withCurrentIssueCriteria(true);+ for (TransitionSpec transition: getTransitionSpecs()) {+ if (transition.getTrigger() instanceof StateTransitionTrigger) {+ Project project = issue.getProject();+ ProjectScope projectScope = new ProjectScope(project, true, true);+ StateTransitionTrigger trigger = (StateTransitionTrigger) transition.getTrigger();+ if (trigger.getStates().contains(issue.getState())) {+ IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), option, true);+ List<Criteria<Issue>> criterias = new ArrayList<>();++ List<Criteria<Issue>> fromStateCriterias = new ArrayList<>();+ for (String fromState: transition.getFromStates())+ fromStateCriterias.add(new StateCriteria(fromState, IssueQueryLexer.Is));++ criterias.add(Criteria.orCriterias(fromStateCriterias));+ if (query.getCriteria() != null)+ criterias.add(query.getCriteria());+ query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());+ Issue.push(issue);+ try {+ for (Issue each: issueManager.query(+ projectScope, query, true, 0, Integer.MAX_VALUE)) {+ String message = "State changed as issue #" + issue.getNumber()+ + " transited to '" + issue.getState() + "'";+ changeState(each, transition.getToState(), new HashMap<>(),+ transition.getRemoveFields(), message);}- });- return null;+ } finally {+ Issue.pop();+ }}- });+ }}- });+ } catch (Exception e) {+ logger.error("Error changing issue state", e);+ }}- });++ }, LockUtils.getLock(getLockKey(projectId)));}}@@ -417,144 +386,105 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>public void on(BuildFinished event) {Long buildId = event.getBuild().getId();Long projectId = event.getBuild().getProject().getId();- transactionManager.runAfterCommit(new Runnable() {+ transactionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- executorService.execute(new Runnable() {-- @Override- public void run() {- LockUtils.call(getLockKey(projectId), new Callable<Void>() {-- @Override- public Void call() throws Exception {- transactionManager.run(new Runnable() {-- @Override- public void run() {- try {- SecurityUtils.bindAsSystem();- Build build = buildManager.load(buildId);-- IssueQueryParseOption option = new IssueQueryParseOption().withCurrentBuildCriteria(true);- for (TransitionSpec transition: getTransitionSpecs()) {- if (transition.getTrigger() instanceof BuildSuccessfulTrigger) {- Project project = build.getProject();- ProjectScope projectScope = new ProjectScope(project, true, true);- BuildSuccessfulTrigger trigger = (BuildSuccessfulTrigger) transition.getTrigger();- String branches = trigger.getBranches();- ObjectId commitId = ObjectId.fromString(build.getCommitHash());- if ((trigger.getJobNames() == null || PatternSet.parse(trigger.getJobNames()).matches(new StringMatcher(), build.getJobName()))- && build.getStatus() == Build.Status.SUCCESSFUL- && (branches == null || project.isCommitOnBranches(commitId, branches))) {- IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), option, true);- List<Criteria<Issue>> criterias = new ArrayList<>();-- List<Criteria<Issue>> fromStateCriterias = new ArrayList<>();- for (String fromState: transition.getFromStates())- fromStateCriterias.add(new StateCriteria(fromState, IssueQueryLexer.Is));-- criterias.add(Criteria.orCriterias(fromStateCriterias));- if (query.getCriteria() != null)- criterias.add(query.getCriteria());- query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());- Build.push(build);- try {- for (Issue issue: issueManager.query(projectScope, query, true, 0, Integer.MAX_VALUE)) {- String message = "State changed as build #" + build.getNumber() + " is successful";- changeState(issue, transition.getToState(), new HashMap<>(),- transition.getRemoveFields(), message);- }- } finally {- Build.pop();- }- }- }- }- } catch (Exception e) {- logger.error("Error changing issue state", e);- }+ try {+ SecurityUtils.bindAsSystem();+ Build build = buildManager.load(buildId);++ IssueQueryParseOption option = new IssueQueryParseOption().withCurrentBuildCriteria(true);+ for (TransitionSpec transition: getTransitionSpecs()) {+ if (transition.getTrigger() instanceof BuildSuccessfulTrigger) {+ Project project = build.getProject();+ ProjectScope projectScope = new ProjectScope(project, true, true);+ BuildSuccessfulTrigger trigger = (BuildSuccessfulTrigger) transition.getTrigger();+ String branches = trigger.getBranches();+ ObjectId commitId = ObjectId.fromString(build.getCommitHash());+ if ((trigger.getJobNames() == null || PatternSet.parse(trigger.getJobNames()).matches(new StringMatcher(), build.getJobName()))+ && build.getStatus() == Build.Status.SUCCESSFUL+ && (branches == null || project.isCommitOnBranches(commitId, branches))) {+ IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), option, true);+ List<Criteria<Issue>> criterias = new ArrayList<>();++ List<Criteria<Issue>> fromStateCriterias = new ArrayList<>();+ for (String fromState: transition.getFromStates())+ fromStateCriterias.add(new StateCriteria(fromState, IssueQueryLexer.Is));++ criterias.add(Criteria.orCriterias(fromStateCriterias));+ if (query.getCriteria() != null)+ criterias.add(query.getCriteria());+ query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());+ Build.push(build);+ try {+ for (Issue issue: issueManager.query(projectScope, query, true, 0, Integer.MAX_VALUE)) {+ String message = "State changed as build #" + build.getNumber() + " is successful";+ changeState(issue, transition.getToState(), new HashMap<>(),+ transition.getRemoveFields(), message);}- });- return null;+ } finally {+ Build.pop();+ }}- });+ }}- });+ } catch (Exception e) {+ logger.error("Error changing issue state", e);+ }}- });++ }, LockUtils.getLock(getLockKey(projectId)));}private void on(PullRequest request, Class<? extends PullRequestTrigger> triggerClass) {Long requestId = request.getId();Long projectId = request.getTargetProject().getId();- transactionManager.runAfterCommit(new Runnable() {+ transactionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- executorService.execute(new Runnable() {-- @Override- public void run() {- LockUtils.call(getLockKey(projectId), new Callable<Void>() {-- @Override- public Void call() throws Exception {- transactionManager.run(new Runnable() {-- @Override- public void run() {- try {- SecurityUtils.bindAsSystem();- Matcher matcher = new PathMatcher();- PullRequest request = pullRequestManager.load(requestId);- Project project = request.getTargetProject();- ProjectScope projectScope = new ProjectScope(project, true, true);- IssueQueryParseOption option = new IssueQueryParseOption().withCurrentPullRequestCriteria(true);- for (TransitionSpec transition: getTransitionSpecs()) {- if (transition.getTrigger().getClass() == triggerClass) {- PullRequestTrigger trigger = (PullRequestTrigger) transition.getTrigger();- if (trigger.getBranches() == null || PatternSet.parse(trigger.getBranches()).matches(matcher, request.getTargetBranch())) {- IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), option, true);- List<Criteria<Issue>> criterias = new ArrayList<>();-- List<Criteria<Issue>> fromStateCriterias = new ArrayList<>();- for (String fromState: transition.getFromStates())- fromStateCriterias.add(new StateCriteria(fromState, IssueQueryLexer.Is));-- criterias.add(Criteria.orCriterias(fromStateCriterias));- if (query.getCriteria() != null)- criterias.add(query.getCriteria());- query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());- PullRequest.push(request);- try {- for (Issue issue: issueManager.query(projectScope, query, true, 0, Integer.MAX_VALUE)) {- String statusName = request.getStatus().toString().toLowerCase();- changeState(issue, transition.getToState(), new HashMap<>(),- transition.getRemoveFields(),- "State changed as pull request #" + request.getNumber() + " is " + statusName);- }- } finally {- PullRequest.pop();- }- }- }- }- } catch (Exception e) {- logger.error("Error changing issue state", e);- }+ try {+ SecurityUtils.bindAsSystem();+ Matcher matcher = new PathMatcher();+ PullRequest request = pullRequestManager.load(requestId);+ Project project = request.getTargetProject();+ ProjectScope projectScope = new ProjectScope(project, true, true);+ IssueQueryParseOption option = new IssueQueryParseOption().withCurrentPullRequestCriteria(true);+ for (TransitionSpec transition: getTransitionSpecs()) {+ if (transition.getTrigger().getClass() == triggerClass) {+ PullRequestTrigger trigger = (PullRequestTrigger) transition.getTrigger();+ if (trigger.getBranches() == null || PatternSet.parse(trigger.getBranches()).matches(matcher, request.getTargetBranch())) {+ IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), option, true);+ List<Criteria<Issue>> criterias = new ArrayList<>();++ List<Criteria<Issue>> fromStateCriterias = new ArrayList<>();+ for (String fromState: transition.getFromStates())+ fromStateCriterias.add(new StateCriteria(fromState, IssueQueryLexer.Is));++ criterias.add(Criteria.orCriterias(fromStateCriterias));+ if (query.getCriteria() != null)+ criterias.add(query.getCriteria());+ query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());+ PullRequest.push(request);+ try {+ for (Issue issue: issueManager.query(projectScope, query, true, 0, Integer.MAX_VALUE)) {+ String statusName = request.getStatus().toString().toLowerCase();+ changeState(issue, transition.getToState(), new HashMap<>(),+ transition.getRemoveFields(),+ "State changed as pull request #" + request.getNumber() + " is " + statusName);}- });- return null;+ } finally {+ PullRequest.pop();+ }}-- });+ }}-- });+ } catch (Exception e) {+ logger.error("Error changing issue state", e);+ }}- });+ }, LockUtils.getLock(getLockKey(projectId)));}@Transactional@@ -595,103 +525,83 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>Long projectId = project.getId();ObjectId oldCommitId = event.getOldCommitId();- transactionManager.runAfterCommit(new Runnable() {+ transactionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- executorService.execute(new Runnable() {-- @Override- public void run() {- LockUtils.call(getLockKey(projectId), new Callable<Void>() {-- @Override- public Void call() throws Exception {- transactionManager.run(new Runnable() {+ try {+ SecurityUtils.bindAsSystem();+ Project project = projectManager.load(projectId);+ ProjectScope projectScope = new ProjectScope(project, true, true);+ Set<Long> fixedIssueIds = new HashSet<>();+ try (RevWalk revWalk = new RevWalk(project.getRepository())) {+ revWalk.markStart(revWalk.lookupCommit(newCommitId));+ if (oldCommitId.equals(ObjectId.zeroId())) {+ /*+ * In case a new branch is pushed, we only process new commits not in any existing branches+ * for performance reason. This is reasonable as state of fixed issues by commits in+ * existing branches most probably is already transited+ */+ for (Ref ref: project.getRepository().getRefDatabase().getRefsByPrefix(Constants.R_HEADS)) {+ if (!ref.getName().equals(refName))+ revWalk.markUninteresting(revWalk.lookupCommit(ref.getObjectId()));+ }+ } else {+ revWalk.markUninteresting(revWalk.lookupCommit(oldCommitId));+ }+ RevCommit commit;+ while ((commit = revWalk.next()) != null) {+ fixedIssueIds.addAll(project.parseFixedIssueIds(commit.getFullMessage()));+ if (fixedIssueIds.size() > MAX_FIXED_ISSUES)+ break;+ }+ }++ IssueQueryParseOption option = new IssueQueryParseOption().withCurrentCommitCriteria(true);+ for (TransitionSpec transition: getTransitionSpecs()) {+ if (transition.getTrigger() instanceof BranchUpdateTrigger) {+ BranchUpdateTrigger trigger = (BranchUpdateTrigger) transition.getTrigger();+ String branches = trigger.getBranches();+ Matcher matcher = new PathMatcher();+ if (branches == null || PatternSet.parse(branches).matches(matcher, branchName)) {+ IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), option, true);+ List<Criteria<Issue>> criterias = new ArrayList<>();++ List<Criteria<Issue>> fromStateCriterias = new ArrayList<>();+ for (String fromState: transition.getFromStates())+ fromStateCriterias.add(new StateCriteria(fromState, IssueQueryLexer.Is));++ criterias.add(Criteria.orCriterias(fromStateCriterias));+ if (query.getCriteria() != null)+ criterias.add(query.getCriteria());+ query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());+ ProjectScopedCommit.push(new ProjectScopedCommit(project, newCommitId) {++ private static final long serialVersionUID = 1L;@Override- public void run() {- try {- SecurityUtils.bindAsSystem();- Project project = projectManager.load(projectId);- ProjectScope projectScope = new ProjectScope(project, true, true);- Set<Long> fixedIssueIds = new HashSet<>();- try (RevWalk revWalk = new RevWalk(project.getRepository())) {- revWalk.markStart(revWalk.lookupCommit(newCommitId));- if (oldCommitId.equals(ObjectId.zeroId())) {- /*- * In case a new branch is pushed, we only process new commits not in any existing branches- * for performance reason. This is reasonable as state of fixed issues by commits in- * existing branches most probably is already transited- */- for (Ref ref: project.getRepository().getRefDatabase().getRefsByPrefix(Constants.R_HEADS)) {- if (!ref.getName().equals(refName))- revWalk.markUninteresting(revWalk.lookupCommit(ref.getObjectId()));- }- } else {- revWalk.markUninteresting(revWalk.lookupCommit(oldCommitId));- }- RevCommit commit;- while ((commit = revWalk.next()) != null) {- fixedIssueIds.addAll(project.parseFixedIssueIds(commit.getFullMessage()));- if (fixedIssueIds.size() > MAX_FIXED_ISSUES)- break;- }- }-- IssueQueryParseOption option = new IssueQueryParseOption().withCurrentCommitCriteria(true);- for (TransitionSpec transition: getTransitionSpecs()) {- if (transition.getTrigger() instanceof BranchUpdateTrigger) {- BranchUpdateTrigger trigger = (BranchUpdateTrigger) transition.getTrigger();- String branches = trigger.getBranches();- Matcher matcher = new PathMatcher();- if (branches == null || PatternSet.parse(branches).matches(matcher, branchName)) {- IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), option, true);- List<Criteria<Issue>> criterias = new ArrayList<>();-- List<Criteria<Issue>> fromStateCriterias = new ArrayList<>();- for (String fromState: transition.getFromStates())- fromStateCriterias.add(new StateCriteria(fromState, IssueQueryLexer.Is));-- criterias.add(Criteria.orCriterias(fromStateCriterias));- if (query.getCriteria() != null)- criterias.add(query.getCriteria());- query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());- ProjectScopedCommit.push(new ProjectScopedCommit(project, newCommitId) {-- private static final long serialVersionUID = 1L;-- @Override- public Collection<Long> getFixedIssueIds() {- return fixedIssueIds;- }-- });- try {- for (Issue issue: issueManager.query(projectScope, query, true, 0, Integer.MAX_VALUE)) {- changeState(issue, transition.getToState(), new HashMap<>(),- transition.getRemoveFields(), "State changed as code fixing the issue is committed");- }- } finally {- ProjectScopedCommit.pop();- }- }- }- }- } catch (Exception e) {- logger.error("Error changing issue state", e);- }+ public Collection<Long> getFixedIssueIds() {+ return fixedIssueIds;}+});- return null;+ try {+ for (Issue issue: issueManager.query(projectScope, query, true, 0, Integer.MAX_VALUE)) {+ changeState(issue, transition.getToState(), new HashMap<>(),+ transition.getRemoveFields(), "State changed as code fixing the issue is committed");+ }+ } finally {+ ProjectScopedCommit.pop();+ }}-- });+ }}-- });+ } catch (Exception e) {+ logger.error("Error changing issue state", e);+ }}- });++ }, LockUtils.getLock(getLockKey(projectId)));}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.javaindex 0d51cdbdb8..e7bf1400ba 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java@@ -12,7 +12,6 @@ import io.onedev.server.entitymanager.IssueCommentManager;import io.onedev.server.event.issue.IssueCommented;import io.onedev.server.model.IssueComment;import io.onedev.server.persistence.SessionManager;-import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;@@ -23,16 +22,12 @@ public class DefaultIssueCommentManager extends BaseEntityManager<IssueComment>private final ListenerRegistry listenerRegistry;- private final TransactionManager transactionManager;-private final SessionManager sessionManager;@Inject- public DefaultIssueCommentManager(Dao dao, ListenerRegistry listenerRegistry,- TransactionManager transactionManager, SessionManager sessionManager) {+ public DefaultIssueCommentManager(Dao dao, ListenerRegistry listenerRegistry, SessionManager sessionManager) {super(dao);this.listenerRegistry = listenerRegistry;- this.transactionManager = transactionManager;this.sessionManager = sessionManager;}@@ -58,18 +53,11 @@ public class DefaultIssueCommentManager extends BaseEntityManager<IssueComment>comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()+1);Long commentId = comment.getId();- transactionManager.runAfterCommit(new Runnable() {+ sessionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- sessionManager.runAsync(new Runnable() {-- @Override- public void run() {- listenerRegistry.post(new IssueCommented(load(commentId), notifiedEmailAddresses));- }-- });+ listenerRegistry.post(new IssueCommented(load(commentId), notifiedEmailAddresses));}});diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 035f48b8d5..82c81c1c98 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@@ -263,18 +263,11 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssauthorizationManager.save(authorization);Long issueId = issue.getId();- transactionManager.runAfterCommit(new Runnable() {+ sessionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- sessionManager.runAsync(new Runnable() {-- @Override- public void run() {- listenerRegistry.post(new IssueOpened(load(issueId)));- }-- });+ listenerRegistry.post(new IssueOpened(load(issueId)));}});diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex c4ec823530..a3e844c61b 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@@ -532,34 +532,27 @@ public class DefaultProjectManager extends BaseEntityManager<Project>Long projectId = project.getId();- transactionManager.runAfterCommit(new Runnable() {+ sessionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- sessionManager.runAsync(new Runnable() {-- @Override- public void run() {- try {- Project project = load(projectId);-- for (ImmutableTriple<String, ObjectId, ObjectId> each: refUpdatedEventData) {- String refName = each.getLeft();- ObjectId oldObjectId = each.getMiddle();- ObjectId newObjectId = each.getRight();- if (!newObjectId.equals(ObjectId.zeroId()))- project.cacheObjectId(refName, newObjectId);- else- project.cacheObjectId(refName, null);-- listenerRegistry.post(new RefUpdated(project, refName, oldObjectId, newObjectId));- }- } catch (Exception e) {- logger.error("Error posting ref updated event", e);- }- }-- });+ try {+ Project project = load(projectId);++ for (ImmutableTriple<String, ObjectId, ObjectId> each: refUpdatedEventData) {+ String refName = each.getLeft();+ ObjectId oldObjectId = each.getMiddle();+ ObjectId newObjectId = each.getRight();+ if (!newObjectId.equals(ObjectId.zeroId()))+ project.cacheObjectId(refName, newObjectId);+ else+ project.cacheObjectId(refName, null);++ listenerRegistry.post(new RefUpdated(project, refName, oldObjectId, newObjectId));+ }+ } catch (Exception e) {+ logger.error("Error posting ref updated event", e);+ }}});@@ -697,19 +690,12 @@ public class DefaultProjectManager extends BaseEntityManager<Project>}Long projectId = project.getId();- transactionManager.runAfterCommit(new Runnable() {+ sessionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- sessionManager.runAsync(new Runnable() {-- @Override- public void run() {- Project project = load(projectId);- listenerRegistry.post(new RefUpdated(project, refName, commitId, ObjectId.zeroId()));- }-- });+ Project project = load(projectId);+ listenerRegistry.post(new RefUpdated(project, refName, commitId, ObjectId.zeroId()));}});@@ -744,19 +730,12 @@ public class DefaultProjectManager extends BaseEntityManager<Project>}Long projectId = project.getId();- transactionManager.runAfterCommit(new Runnable() {+ sessionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- sessionManager.runAsync(new Runnable() {-- @Override- public void run() {- Project project = load(projectId);- listenerRegistry.post(new RefUpdated(project, refName, commitId, ObjectId.zeroId()));- }-- });+ Project project = load(projectId);+ listenerRegistry.post(new RefUpdated(project, refName, commitId, ObjectId.zeroId()));}});diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 8a430868dc..18cc745abe 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -391,22 +391,16 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imLong requestId = request.getId();ObjectId newTargetHeadId = mergeCommitId;- transactionManager.runAfterCommit(new Runnable() {+ sessionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- dao.getSessionManager().runAsync(new Runnable() {-- @Override- public void run() {- PullRequest request = load(requestId);- request.getTargetProject().cacheObjectId(request.getTargetRef(), newTargetHeadId);- listenerRegistry.post(new RefUpdated(request.getTargetProject(), targetRef,- targetHeadCommitId, newTargetHeadId));- }-- });+ PullRequest request = load(requestId);+ request.getTargetProject().cacheObjectId(request.getTargetRef(), newTargetHeadId);+ listenerRegistry.post(new RefUpdated(request.getTargetProject(), targetRef,+ targetHeadCommitId, newTargetHeadId));}+});}diff --git a/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java b/server-core/src/main/java/io/onedev/server/event/ProjectCreated.javaindex baafb25d5e..c37b72e7db 100644--- a/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java+++ b/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java@@ -1,6 +1,7 @@package io.onedev.server.event;import io.onedev.server.model.Project;+import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;public class ProjectCreated extends ProjectEvent {@@ -14,4 +15,9 @@ public class ProjectCreated extends ProjectEvent {return "created";}+ @Override+ public ProjectEvent cloneIn(Dao dao) {+ return new ProjectCreated(dao.load(Project.class, getProject().getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/ProjectEvent.java b/server-core/src/main/java/io/onedev/server/event/ProjectEvent.javaindex b98fc19417..672528cf5d 100644--- a/server-core/src/main/java/io/onedev/server/event/ProjectEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/ProjectEvent.java@@ -5,20 +5,15 @@ import java.util.Optional;import javax.annotation.Nullable;-import org.jsoup.Jsoup;-import org.jsoup.nodes.Document.OutputSettings;-import org.jsoup.safety.Safelist;--import com.google.common.base.Joiner;-import com.ibm.icu.impl.locale.XCldrStub.Splitter;-import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.mail.MailManager;import io.onedev.server.markdown.MarkdownManager;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.LastUpdate;import io.onedev.server.notification.ActivityDetail;+import io.onedev.server.persistence.dao.Dao;public abstract class ProjectEvent extends Event {@@ -85,18 +80,12 @@ public abstract class ProjectEvent extends Event {@Nullablepublic String getTextBody() {- ActivityDetail activityDetail = getActivityDetail();String markdown = getMarkdown();+ MailManager mailManager = OneDev.getInstance(MailManager.class);+ if (markdown != null && mailManager.isMailContent(markdown))+ markdown = mailManager.toPlainText(markdown);- String htmlMarker = String.format("<div class='%s'>", MailManager.INCOMING_CONTENT_MARKER);- if (markdown != null && markdown.contains(htmlMarker)) {- OutputSettings outputSettings = new OutputSettings();- outputSettings.prettyPrint(false);- markdown = Jsoup.clean(markdown, "", Safelist.none(), outputSettings);- markdown = Joiner.on('\n').join(Splitter.on('\n').trimResults().split(markdown));- markdown = markdown.replaceAll("\n\n(\n)+", "\n\n").trim();- }-+ ActivityDetail activityDetail = getActivityDetail();if (activityDetail != null && markdown != null)return activityDetail.getTextVersion() + "\n\n" + markdown;else if (activityDetail != null)@@ -122,4 +111,9 @@ public abstract class ProjectEvent extends Event {return null;}+ public abstract ProjectEvent cloneIn(Dao dao);++ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(project);+ }}diff --git a/server-core/src/main/java/io/onedev/server/event/RefUpdated.java b/server-core/src/main/java/io/onedev/server/event/RefUpdated.javaindex 6bbc03c43c..d81f801410 100644--- a/server-core/src/main/java/io/onedev/server/event/RefUpdated.java+++ b/server-core/src/main/java/io/onedev/server/event/RefUpdated.java@@ -4,7 +4,10 @@ import java.util.Date;import org.eclipse.jgit.lib.ObjectId;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.Project;+import io.onedev.server.persistence.dao.Dao;import io.onedev.server.util.CommitAware;import io.onedev.server.util.ProjectScopedCommit;@@ -48,5 +51,18 @@ public class RefUpdated extends ProjectEvent implements CommitAware {public String getActivity() {return "Git ref updated";}++ @Override+ public ProjectEvent cloneIn(Dao dao) {+ return new RefUpdated(dao.load(Project.class, getProject().getId()), refName, oldCommitId, newCommitId);+ }++ @Override+ public String getUrl() {+ if (newCommitId != null)+ return OneDev.getInstance(UrlManager.class).urlFor(getProject(), newCommitId);+ else+ throw new UnsupportedOperationException();+ }}diff --git a/server-core/src/main/java/io/onedev/server/event/ScheduledTimeReaches.java b/server-core/src/main/java/io/onedev/server/event/ScheduledTimeReaches.javaindex 4731b7216a..50c641865a 100644--- a/server-core/src/main/java/io/onedev/server/event/ScheduledTimeReaches.java+++ b/server-core/src/main/java/io/onedev/server/event/ScheduledTimeReaches.java@@ -3,6 +3,7 @@ package io.onedev.server.event;import java.util.Date;import io.onedev.server.model.Project;+import io.onedev.server.persistence.dao.Dao;public class ScheduledTimeReaches extends ProjectEvent {@@ -14,5 +15,10 @@ public class ScheduledTimeReaches extends ProjectEvent {public String getActivity() {return "Scheduled time reaches ";}++ @Override+ public ProjectEvent cloneIn(Dao dao) {+ return new ScheduledTimeReaches(dao.load(Project.class, getProject().getId()));+ }}diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.javaindex f196190551..bdbbd87292 100644--- a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java@@ -4,10 +4,11 @@ import java.util.Date;import org.eclipse.jgit.lib.ObjectId;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.event.ProjectEvent;import io.onedev.server.model.Build;import io.onedev.server.model.User;-import io.onedev.server.persistence.dao.Dao;import io.onedev.server.util.CommitAware;import io.onedev.server.util.ProjectScopedCommit;@@ -38,6 +39,9 @@ public abstract class BuildEvent extends ProjectEvent implements CommitAware {return build.getStatus().toString();}- public abstract BuildEvent cloneIn(Dao dao);+ @Override+ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(build);+ }}diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.javaindex a49f6cac72..c86034666b 100644--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java@@ -2,10 +2,11 @@ package io.onedev.server.event.codecomment;import java.util.Date;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.event.ProjectEvent;import io.onedev.server.model.CodeComment;import io.onedev.server.model.User;-import io.onedev.server.persistence.dao.Dao;public abstract class CodeCommentEvent extends ProjectEvent {@@ -25,5 +26,9 @@ public abstract class CodeCommentEvent extends ProjectEvent {return comment;}- public abstract CodeCommentEvent cloneIn(Dao dao);+ @Override+ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(comment);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.javaindex f859ce8c90..c613d262f1 100644--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java@@ -1,5 +1,7 @@package io.onedev.server.event.codecomment;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.persistence.dao.Dao;@@ -31,4 +33,9 @@ public class CodeCommentReplied extends CodeCommentEvent {return new CodeCommentReplied(dao.load(CodeCommentReply.class, reply.getId()));}+ @Override+ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(reply);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.javaindex 5bd1cf7ef8..7f2b98141e 100644--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.java+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.java@@ -2,6 +2,8 @@ package io.onedev.server.event.codecomment;import javax.annotation.Nullable;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.persistence.dao.Dao;@@ -43,5 +45,10 @@ public class CodeCommentStatusChanged extends CodeCommentEvent {public CodeCommentEvent cloneIn(Dao dao) {return new CodeCommentStatusChanged(dao.load(CodeCommentStatusChange.class, change.getId()), note);}++ @Override+ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(change);+ }}diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.javaindex 2864e53b01..0209dc162d 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java@@ -5,6 +5,8 @@ import java.util.Map;import javax.annotation.Nullable;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.Group;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;@@ -67,4 +69,9 @@ public class IssueChanged extends IssueEvent {return new IssueChanged(dao.load(IssueChange.class, change.getId()), comment);}+ @Override+ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(change);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.javaindex 6198d50c0c..05500358b4 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java@@ -2,6 +2,8 @@ package io.onedev.server.event.issue;import java.util.Collection;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.IssueComment;import io.onedev.server.persistence.dao.Dao;@@ -44,5 +46,10 @@ public class IssueCommented extends IssueEvent {public IssueEvent cloneIn(Dao dao) {return new IssueCommented(dao.load(IssueComment.class, comment.getId()), notifiedEmailAddresses);}++ @Override+ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(getComment());+ }}diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.javaindex 76453225ca..1ea121f1c2 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.java@@ -5,11 +5,12 @@ import java.util.Date;import java.util.HashMap;import java.util.Map;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.event.ProjectEvent;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.User;-import io.onedev.server.persistence.dao.Dao;public abstract class IssueEvent extends ProjectEvent {@@ -34,6 +35,9 @@ public abstract class IssueEvent extends ProjectEvent {return new HashMap<>();}- public abstract IssueEvent cloneIn(Dao dao);+ @Override+ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(issue);+ }}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.javaindex 291234d354..b6bdf36afa 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java@@ -4,6 +4,8 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;@@ -65,4 +67,9 @@ public class PullRequestChanged extends PullRequestEvent implements CommitAwarereturn new PullRequestChanged(dao.load(PullRequestChange.class, change.getId()), note);}+ @Override+ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(change);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.javaindex 846ddf22fe..12cbff27f0 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java@@ -1,5 +1,7 @@package io.onedev.server.event.pullrequest;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.PullRequest;import io.onedev.server.persistence.dao.Dao;@@ -27,4 +29,9 @@ public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent {dao.load(CodeComment.class, getComment().getId()));}+ @Override+ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(getComment());+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.javaindex 1a267d59ee..91118260cb 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java@@ -1,5 +1,7 @@package io.onedev.server.event.pullrequest;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.PullRequest;import io.onedev.server.persistence.dao.Dao;@@ -34,4 +36,9 @@ public class PullRequestCodeCommentReplied extends PullRequestCodeCommentEvent {dao.load(CodeCommentReply.class, reply.getId()));}+ @Override+ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(reply);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentStatusChanged.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentStatusChanged.javaindex b2655ca79e..33fd662bfd 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentStatusChanged.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentStatusChanged.java@@ -2,6 +2,8 @@ package io.onedev.server.event.pullrequest;import javax.annotation.Nullable;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.model.PullRequest;import io.onedev.server.persistence.dao.Dao;@@ -44,4 +46,9 @@ public class PullRequestCodeCommentStatusChanged extends PullRequestCodeCommentEnote);}+ @Override+ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(getChange());+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.javaindex 130551fd5b..6251da3e61 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java@@ -2,6 +2,8 @@ package io.onedev.server.event.pullrequest;import java.util.Collection;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.PullRequestComment;import io.onedev.server.persistence.dao.Dao;@@ -42,4 +44,9 @@ public class PullRequestCommented extends PullRequestEvent {notifiedEmailAddresses);}+ @Override+ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(comment);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.javaindex 1dbce3b0b5..a3d8f7cca8 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java@@ -2,10 +2,11 @@ package io.onedev.server.event.pullrequest;import java.util.Date;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.event.ProjectEvent;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.persistence.dao.Dao;public abstract class PullRequestEvent extends ProjectEvent {@@ -20,6 +21,9 @@ public abstract class PullRequestEvent extends ProjectEvent {return request;}- public abstract PullRequestEvent cloneIn(Dao dao);+ @Override+ public String getUrl() {+ return OneDev.getInstance(UrlManager.class).urlFor(request);+ }}diff --git a/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java b/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.javaindex cd986d30ff..266b2b5ab9 100644--- a/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java+++ b/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java@@ -88,26 +88,19 @@ public class DefaultResourceManager implements ResourceManager {@Listenpublic void on(AgentConnected event) {Long agentId = event.getAgent().getId();- transactionManager.runAfterCommit(new Runnable() {+ sessionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- sessionManager.runAsync(new Runnable() {-- @Override- public void run() {- synchronized (DefaultResourceManager.this) {- Agent agent = agentManager.load(agentId);- agentResourceHolders.put(agentId, new ResourceHolder(agent.getResources()));- for (QueryCache cache: queryCaches.values()) {- if (cache.query.matches(agent))- cache.result.add(agentId);- }- DefaultResourceManager.this.notifyAll();- }+ synchronized (DefaultResourceManager.this) {+ Agent agent = agentManager.load(agentId);+ agentResourceHolders.put(agentId, new ResourceHolder(agent.getResources()));+ for (QueryCache cache: queryCaches.values()) {+ if (cache.query.matches(agent))+ cache.result.add(agentId);}-- });+ DefaultResourceManager.this.notifyAll();+ }}});diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.javaindex 7d14184c02..e1bc80d6a0 100644--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java@@ -49,9 +49,11 @@ import org.apache.shiro.authz.Permission;import org.apache.shiro.authz.UnauthorizedException;import org.jsoup.Jsoup;import org.jsoup.nodes.Document;+import org.jsoup.nodes.Document.OutputSettings;import org.jsoup.nodes.Element;import org.jsoup.nodes.Node;import org.jsoup.nodes.TextNode;+import org.jsoup.safety.Safelist;import org.jsoup.select.NodeTraversor;import org.jsoup.select.NodeVisitor;import org.slf4j.Logger;@@ -59,6 +61,7 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Joiner;import com.google.common.collect.Lists;+import com.ibm.icu.impl.locale.XCldrStub.Splitter;import com.sun.mail.imap.IMAPFolder;import edu.emory.mathcs.backport.java.util.Arrays;@@ -657,7 +660,7 @@ public class DefaultMailManager implements MailManager {comment.setUser(user);String content = stripQuotation(sendSetting, readText(issue.getProject(), issue.getUUID(), message));if (content != null) {- comment.setContent(String.format("<div class='%s'>" + content + "</div>", INCOMING_CONTENT_MARKER));+ comment.setContent(String.format("<div class='%s'>" + content + "</div>", COMMENT_MARKER));issueCommentManager.save(comment, receiverEmailAddresses);}}@@ -1099,6 +1102,21 @@ public class DefaultMailManager implements MailManager {}+ @Override+ public String toPlainText(String mailContent) {+ OutputSettings outputSettings = new OutputSettings();+ outputSettings.prettyPrint(false);+ String plainText = Jsoup.clean(mailContent, "", Safelist.none(), outputSettings);+ plainText = Joiner.on('\n').join(Splitter.on('\n').trimResults().split(plainText));+ plainText = plainText.replaceAll("\n\n(\n)+", "\n\n").trim();+ return plainText;+ }++ @Override+ public boolean isMailContent(String comment) {+ return comment.contains(String.format("<div class='%s'>", COMMENT_MARKER));+ }+private static class ImageAttachment extends Attachment {public ImageAttachment(String url, String fileName) {diff --git a/server-core/src/main/java/io/onedev/server/mail/MailManager.java b/server-core/src/main/java/io/onedev/server/mail/MailManager.javaindex c598308321..5f30ab9e00 100644--- a/server-core/src/main/java/io/onedev/server/mail/MailManager.java+++ b/server-core/src/main/java/io/onedev/server/mail/MailManager.java@@ -12,7 +12,7 @@ public interface MailManager {public static final String TEST_SUB_ADDRESS = "test~subaddressing";- public static final String INCOMING_CONTENT_MARKER = "no-color";+ public static final String COMMENT_MARKER = "no-color";void sendMail(Collection<String> toList, Collection<String> ccList,Collection<String> bccList, String subject, String htmlBody,@@ -38,6 +38,10 @@ public interface MailManager {@Nullablepublic String getUnsubscribeAddress(PullRequest request);+ boolean isMailContent(String comment);++ String toPlainText(String mailContent);+Future<?> monitorInbox(MailCheckSetting mailCheckSetting, MessageListener listener, MailPosition MailPosition);}diff --git a/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownManager.java b/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownManager.javaindex 7a06afc8d5..082f59bca2 100644--- a/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownManager.java+++ b/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownManager.java@@ -76,9 +76,8 @@ public class DefaultMarkdownManager implements MarkdownManager {@Overridepublic String render(String markdown) {- MutableDataHolder options = setupOptions();Node node = parse(markdown);- return HtmlRenderer.builder(options).softBreak("<br>").build().render(node);+ return HtmlRenderer.builder(setupOptions()).softBreak("<br>").build().render(node);}@Overridediff --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 a6b1b10e4a..617006f839 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@@ -141,7 +141,6 @@ import io.onedev.server.model.support.issue.ProjectIssueSetting;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;import io.onedev.server.persistence.SessionManager;-import io.onedev.server.persistence.TransactionManager;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;import io.onedev.server.storage.AttachmentStorageManager;@@ -1113,20 +1112,13 @@ public class Project extends AbstractEntity {cacheObjectId(refName, commit);ObjectId commitId = commit.copy();- OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {+ OneDev.getInstance(SessionManager.class).runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {-- @Override- public void run() {- Project project = OneDev.getInstance(ProjectManager.class).load(getId());- OneDev.getInstance(ListenerRegistry.class).post(- new RefUpdated(project, refName, ObjectId.zeroId(), commitId));- }-- });+ Project project = OneDev.getInstance(ProjectManager.class).load(getId());+ OneDev.getInstance(ListenerRegistry.class).post(+ new RefUpdated(project, refName, ObjectId.zeroId(), commitId));}});@@ -1165,20 +1157,13 @@ public class Project extends AbstractEntity {cacheObjectId(refName, commit);ObjectId commitId = commit.copy();- OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {+ OneDev.getInstance(SessionManager.class).runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {-- @Override- public void run() {- Project project = OneDev.getInstance(ProjectManager.class).load(getId());- OneDev.getInstance(ListenerRegistry.class).post(- new RefUpdated(project, refName, ObjectId.zeroId(), commitId));- }-- });+ Project project = OneDev.getInstance(ProjectManager.class).load(getId());+ OneDev.getInstance(ListenerRegistry.class).post(+ new RefUpdated(project, refName, ObjectId.zeroId(), commitId));}});diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.javaindex 9b1bd41e26..e218bfcec4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java@@ -34,7 +34,7 @@ public class NamedCodeCommentQuery implements NamedQuery {}@Editable(placeholder="All")- @CodeCommentQuery+ @CodeCommentQuery(withCurrentUserCriteria=true)@Overridepublic String getQuery() {return query;diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.javaindex e361568d9c..137c715524 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java@@ -34,7 +34,7 @@ public class NamedCommitQuery implements NamedQuery {}@Editable(placeholder="All")- @CommitQuery+ @CommitQuery(withCurrentUserCriteria=true)@Overridepublic String getQuery() {return query;diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java b/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.javaindex 4ab6df8bc8..0556574ff4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java@@ -35,7 +35,7 @@ public class NamedBuildQuery implements NamedQuery {}@Editable(placeholder="All")- @BuildQuery(withCurrentUserCriteria = true, withUnfinishedCriteria = true)+ @BuildQuery(withCurrentUserCriteria=true, withUnfinishedCriteria=true)@Overridepublic String getQuery() {return query;diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.javaindex 3bd31b6970..9561347fbb 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java@@ -35,7 +35,7 @@ public class NamedPullRequestQuery implements NamedQuery {}@Editable(placeholder="All")- @PullRequestQuery+ @PullRequestQuery(withCurrentUserCriteria=true)@Overridepublic String getQuery() {return query;diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.javaindex 8ff63c9e61..e3d39f28c1 100644--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java@@ -4,8 +4,6 @@ import java.util.Collection;import java.util.HashMap;import java.util.HashSet;import java.util.Map;-import java.util.concurrent.Callable;-import java.util.concurrent.ExecutorService;import javax.annotation.Nullable;import javax.inject.Inject;@@ -53,21 +51,18 @@ public class BuildNotificationManager extends AbstractNotificationManager {private final TransactionManager transactionManager;- private final ExecutorService executorService;-private final Dao dao;@Injectpublic BuildNotificationManager(MailManager mailManager, UrlManager urlManager,UserManager userManager, SettingManager settingManager,MarkdownManager markdownManager, TransactionManager transactionManager,- ExecutorService executorService, Dao dao) {+ Dao dao) {super(markdownManager, settingManager);this.mailManager = mailManager;this.urlManager = urlManager;this.userManager = userManager;this.transactionManager = transactionManager;- this.executorService = executorService;this.dao = dao;}@@ -102,127 +97,102 @@ public class BuildNotificationManager extends AbstractNotificationManager {@Sessional@Listenpublic void on(BuildEvent event) {- Long buildId = event.getBuild().getId();-- transactionManager.runAfterCommit(new Runnable() {+ transactionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- executorService.execute(new Runnable() {-- @Override- public void run() {- LockUtils.call(Build.getSerialLockName(buildId), true, new Callable<Void>() {-- @Override- public Void call() {- transactionManager.run(new Runnable() {-- @Override- public void run() {- BuildEvent clone = event.cloneIn(dao);- if (!(clone instanceof BuildUpdated)) {- Project project = clone.getProject();- Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();- for (BuildQueryPersonalization personalization: project.getBuildQueryPersonalizations()) {- for (String name: personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {- String commonName = NamedQuery.getCommonName(name);- if (commonName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),- NamedQuery.find(project.getNamedBuildQueries(), commonName));- }- String personalName = NamedQuery.getPersonalName(name);- if (personalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),- NamedQuery.find(personalization.getQueries(), personalName));- }- }- }-- Build build = clone.getBuild();- Collection<String> notifyEmails = new HashSet<>();- for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {- User user = entry.getKey();- Permission permission = new ProjectPermission(build.getProject(),- new JobPermission(build.getJobName(), new AccessBuild()));- if (user.asSubject().isPermitted(permission)) {- for (String queryString: entry.getValue()) {- User.push(user);- try {- if (BuildQuery.parse(clone.getProject(), queryString, true, true).matches(build)) {- EmailAddress emailAddress = user.getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified())- notifyEmails.add(emailAddress.getValue());- break;- }- } catch (Exception e) {- String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",- user.getName(), build.getFQN(), queryString);- logger.error(message, e);- } finally {- User.pop();- }- }- }- }-- subscribedQueryStrings.clear();- for (User user: userManager.query()) {- for (String name: user.getBuildQueryPersonalization().getQuerySubscriptionSupport().getQuerySubscriptions()) {- String globalName = NamedQuery.getCommonName(name);- if (globalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, user,- NamedQuery.find(settingManager.getBuildSetting().getNamedQueries(), globalName));- }- String personalName = NamedQuery.getPersonalName(name);- if (personalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, user,- NamedQuery.find(user.getBuildQueryPersonalization().getQueries(), personalName));- }- }- }+ BuildEvent clone = (BuildEvent) event.cloneIn(dao);+ if (!(clone instanceof BuildUpdated)) {+ Project project = clone.getProject();+ Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();+ for (BuildQueryPersonalization personalization: project.getBuildQueryPersonalizations()) {+ for (String name: personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {+ String commonName = NamedQuery.getCommonName(name);+ if (commonName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),+ NamedQuery.find(project.getNamedBuildQueries(), commonName));+ }+ String personalName = NamedQuery.getPersonalName(name);+ if (personalName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),+ NamedQuery.find(personalization.getQueries(), personalName));+ }+ }+ }- for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {- User user = entry.getKey();- Permission permission = new ProjectPermission(build.getProject(),- new JobPermission(build.getJobName(), new AccessBuild()));- if (user.asSubject().isPermitted(permission)) {- for (String queryString: entry.getValue()) {- User.push(user);- try {- if (BuildQuery.parse(null, queryString, true, true).matches(build)) {- EmailAddress emailAddress = user.getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified())- notifyEmails.add(emailAddress.getValue());- break;- }- } catch (Exception e) {- String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",- user.getName(), build.getFQN(), queryString);- logger.error(message, e);- } finally {- User.pop();- }- }- }- }-- BuildNotificationManager.this.notify(clone, notifyEmails);- }+ Build build = clone.getBuild();+ Collection<String> notifyEmails = new HashSet<>();+ for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {+ User user = entry.getKey();+ Permission permission = new ProjectPermission(build.getProject(),+ new JobPermission(build.getJobName(), new AccessBuild()));+ if (user.asSubject().isPermitted(permission)) {+ for (String queryString: entry.getValue()) {+ User.push(user);+ try {+ if (BuildQuery.parse(clone.getProject(), queryString, true, true).matches(build)) {+ EmailAddress emailAddress = user.getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified())+ notifyEmails.add(emailAddress.getValue());+ break;}-- });- return null;+ } catch (Exception e) {+ String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",+ user.getName(), build.getFQN(), queryString);+ logger.error(message, e);+ } finally {+ User.pop();+ }}-- });+ }}- });+ subscribedQueryStrings.clear();+ for (User user: userManager.query()) {+ for (String name: user.getBuildQueryPersonalization().getQuerySubscriptionSupport().getQuerySubscriptions()) {+ String globalName = NamedQuery.getCommonName(name);+ if (globalName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(settingManager.getBuildSetting().getNamedQueries(), globalName));+ }+ String personalName = NamedQuery.getPersonalName(name);+ if (personalName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(user.getBuildQueryPersonalization().getQueries(), personalName));+ }+ }+ }+ for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {+ User user = entry.getKey();+ Permission permission = new ProjectPermission(build.getProject(),+ new JobPermission(build.getJobName(), new AccessBuild()));+ if (user.asSubject().isPermitted(permission)) {+ for (String queryString: entry.getValue()) {+ User.push(user);+ try {+ if (BuildQuery.parse(null, queryString, true, true).matches(build)) {+ EmailAddress emailAddress = user.getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified())+ notifyEmails.add(emailAddress.getValue());+ break;+ }+ } catch (Exception e) {+ String message = String.format("Error processing build subscription (user: %s, build: %s, query: %s)",+ user.getName(), build.getFQN(), queryString);+ logger.error(message, e);+ } finally {+ User.pop();+ }+ }+ }+ }++ BuildNotificationManager.this.notify(clone, notifyEmails);+ }}- });+ }, LockUtils.getLock(Build.getSerialLockName(event.getBuild().getId()), true));}}diff --git a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.javaindex 41c25b82d1..09a2db8308 100644--- a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java@@ -12,12 +12,9 @@ import com.google.common.collect.Lists;import io.onedev.commons.loader.Listen;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.event.codecomment.CodeCommentCreated;import io.onedev.server.event.codecomment.CodeCommentEvent;-import io.onedev.server.event.codecomment.CodeCommentReplied;-import io.onedev.server.event.codecomment.CodeCommentStatusChanged;+import io.onedev.server.event.codecomment.CodeCommentUpdated;import io.onedev.server.mail.MailManager;import io.onedev.server.markdown.MarkdownManager;import io.onedev.server.markdown.MentionParser;@@ -32,8 +29,6 @@ public class CodeCommentNotificationManager extends AbstractNotificationManagerprivate final MailManager mailManager;- private final UrlManager urlManager;-private final UserManager userManager;private final TransactionManager transactionManager;@@ -42,11 +37,10 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager@Injectpublic CodeCommentNotificationManager(MailManager mailManager, MarkdownManager markdownManager,- UrlManager urlManager, UserManager userManager, SettingManager settingManager,+ UserManager userManager, SettingManager settingManager,TransactionManager transactionManager, Dao dao) {super(markdownManager, settingManager);this.mailManager = mailManager;- this.urlManager = urlManager;this.userManager = userManager;this.transactionManager = transactionManager;this.dao = dao;@@ -55,72 +49,55 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager@Transactional@Listenpublic void on(CodeCommentEvent event) {- transactionManager.runAfterCommit(new Runnable() {+ transactionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- transactionManager.runAsync(new Runnable() {+ CodeCommentEvent clone = (CodeCommentEvent) event.cloneIn(dao);+ CodeComment comment = clone.getComment();+ if (comment.getCompareContext().getPullRequest() == null) {+ String markdown = clone.getMarkdown();+ String renderedMarkdown = markdownManager.render(markdown);+ String processedMarkdown = markdownManager.process(renderedMarkdown, clone.getProject(), null, null, true);++ Collection<User> notifyUsers = new HashSet<>();++ notifyUsers.add(comment.getUser());+ notifyUsers.addAll(comment.getReplies().stream().map(it->it.getUser()).collect(Collectors.toSet()));+ notifyUsers.addAll(comment.getChanges().stream().map(it->it.getUser()).collect(Collectors.toSet()));++ for (String userName: new MentionParser().parseMentions(renderedMarkdown)) {+ User user = userManager.findByName(userName);+ if (user != null)+ notifyUsers.add(user);+ }++ Set<String> emailAddresses = notifyUsers.stream()+ .filter(it-> it.isOrdinary()+ && !it.equals(clone.getUser())+ && it.getPrimaryEmailAddress() != null+ && it.getPrimaryEmailAddress().isVerified())+ .map(it->it.getPrimaryEmailAddress().getValue())+ .collect(Collectors.toSet());- @Override- public void run() {- CodeCommentEvent clone = event.cloneIn(dao);- CodeComment comment = clone.getComment();- if (comment.getCompareContext().getPullRequest() == null) {- String markdown = clone.getMarkdown();- String renderedMarkdown = markdownManager.render(markdown);- String processedMarkdown = markdownManager.process(renderedMarkdown, clone.getProject(), null, null, true);-- Collection<User> notifyUsers = new HashSet<>();-- notifyUsers.add(comment.getUser());- notifyUsers.addAll(comment.getReplies().stream().map(it->it.getUser()).collect(Collectors.toSet()));- notifyUsers.addAll(comment.getChanges().stream().map(it->it.getUser()).collect(Collectors.toSet()));-- for (String userName: new MentionParser().parseMentions(renderedMarkdown)) {- User user = userManager.findByName(userName);- if (user != null)- notifyUsers.add(user);- }+ if (!emailAddresses.isEmpty() && !(clone instanceof CodeCommentUpdated)) {+ String url = clone.getUrl();+ String subject = String.format("[Code Comment] %s:%s",+ clone.getProject().getPath(), comment.getMark().getPath());- Set<String> emailAddresses = notifyUsers.stream()- .filter(it-> it.isOrdinary()- && !it.equals(clone.getUser())- && it.getPrimaryEmailAddress() != null- && it.getPrimaryEmailAddress().isVerified())- .map(it->it.getPrimaryEmailAddress().getValue())- .collect(Collectors.toSet());-- if (!emailAddresses.isEmpty()) {- String url;- if (clone instanceof CodeCommentCreated)- url = urlManager.urlFor(comment);- else if (clone instanceof CodeCommentReplied)- url = urlManager.urlFor(((CodeCommentReplied)clone).getReply());- else if (clone instanceof CodeCommentStatusChanged)- url = urlManager.urlFor(((CodeCommentStatusChanged)clone).getChange());- else- url = null;-- if (url != null) {- String subject = String.format("[Code Comment] %s:%s",- clone.getProject().getPath(), comment.getMark().getPath());-- String summary = String.format("%s %s code comment",- clone.getUser().getDisplayName(), clone.getActivity());-- String threadingReferences = "<" + comment.getProject().getPath()- + "-codecomment-" + comment.getId() + "@onedev>";+ String summary = String.format("%s %s code comment",+ clone.getUser().getDisplayName(), clone.getActivity());++ String threadingReferences = "<" + comment.getProject().getPath()+ + "-codecomment-" + comment.getId() + "@onedev>";- mailManager.sendMailAsync(emailAddresses, Lists.newArrayList(),- Lists.newArrayList(), subject,- getHtmlBody(clone, summary, processedMarkdown, url, false, null),- getTextBody(clone, summary, markdown, url, false, null),- null, threadingReferences);- }- }- }+ mailManager.sendMailAsync(emailAddresses, Lists.newArrayList(),+ Lists.newArrayList(), subject,+ getHtmlBody(clone, summary, processedMarkdown, url, false, null),+ getTextBody(clone, summary, markdown, url, false, null),+ null, threadingReferences);}- });+ }}});diff --git a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.javaindex 3ad5a62651..5ab0838098 100644--- a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java@@ -68,49 +68,49 @@ public class CommitNotificationManager extends AbstractNotificationManager {public void on(RefUpdated event) {if (!event.getNewCommitId().equals(ObjectId.zeroId())) {Project project = event.getProject();- Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();- for (CommitQueryPersonalization setting: project.getCommitQueryPersonalizations()) {- for (String name: setting.getQuerySubscriptionSupport().getQuerySubscriptions()) {- String globalName = NamedQuery.getCommonName(name);- if (globalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),- NamedQuery.find(project.getNamedCommitQueries(), globalName));- }- String personalName = NamedQuery.getPersonalName(name);- if (personalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),- NamedQuery.find(setting.getQueries(), personalName));+ RevCommit commit = project.getRevCommit(event.getNewCommitId(), false);+ if (commit != null) {+ Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();+ for (CommitQueryPersonalization setting: project.getCommitQueryPersonalizations()) {+ for (String name: setting.getQuerySubscriptionSupport().getQuerySubscriptions()) {+ String globalName = NamedQuery.getCommonName(name);+ if (globalName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),+ NamedQuery.find(project.getNamedCommitQueries(), globalName));+ }+ String personalName = NamedQuery.getPersonalName(name);+ if (personalName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),+ NamedQuery.find(setting.getQueries(), personalName));+ }}}- }-- Collection<String> notifyEmails = new HashSet<>();- for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {- User user = entry.getKey();- if (user.asSubject().isPermitted(new ProjectPermission(event.getProject(), new ReadCode()))) {- for (String queryString: entry.getValue()) {- User.push(user);- try {- if (CommitQuery.parse(project, queryString).matches(event)) {- EmailAddress emailAddress = user.getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified())- notifyEmails.add(emailAddress.getValue());- break;++ Collection<String> notifyEmails = new HashSet<>();+ for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {+ User user = entry.getKey();+ if (user.asSubject().isPermitted(new ProjectPermission(event.getProject(), new ReadCode()))) {+ for (String queryString: entry.getValue()) {+ User.push(user);+ try {+ if (CommitQuery.parse(project, queryString, true).matches(event)) {+ EmailAddress emailAddress = user.getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified())+ notifyEmails.add(emailAddress.getValue());+ break;+ }+ } catch (Exception e) {+ String message = String.format("Error processing commit subscription "+ + "(user: %s, project: %s, commit: %s, query: %s)",+ user.getName(), project.getPath(), event.getNewCommitId().name(), queryString);+ logger.error(message, e);+ } finally {+ User.pop();}- } catch (Exception e) {- String message = String.format("Error processing commit subscription "- + "(user: %s, project: %s, commit: %s, query: %s)",- user.getName(), project.getPath(), event.getNewCommitId().name(), queryString);- logger.error(message, e);- } finally {- User.pop();}}}- }-- RevCommit commit = project.getRevCommit(event.getNewCommitId(), false);- if (commit != null) {+String target = GitUtils.ref2branch(event.getRefName());if (target == null) {target = GitUtils.ref2tag(event.getRefName());diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.javaindex 7f54449f48..d386c38f3a 100644--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java@@ -5,8 +5,6 @@ import java.util.Collection;import java.util.Date;import java.util.HashSet;import java.util.Map;-import java.util.concurrent.Callable;-import java.util.concurrent.ExecutorService;import java.util.stream.Collectors;import javax.inject.Inject;@@ -22,7 +20,6 @@ import io.onedev.commons.utils.LockUtils;import io.onedev.server.entitymanager.IssueAuthorizationManager;import io.onedev.server.entitymanager.IssueWatchManager;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.entityreference.ReferencedFromAware;import io.onedev.server.event.issue.IssueChanged;@@ -54,8 +51,6 @@ public class IssueNotificationManager extends AbstractNotificationManager {private final MailManager mailManager;- private final UrlManager urlManager;-private final IssueAuthorizationManager authorizationManager;private final IssueWatchManager watchManager;@@ -66,257 +61,222 @@ public class IssueNotificationManager extends AbstractNotificationManager {private final TransactionManager transactionManager;- private final ExecutorService executorService;-private final Dao dao;@Injectpublic IssueNotificationManager(MarkdownManager markdownManager, MailManager mailManager,- UrlManager urlManager, IssueWatchManager watchManager, UserInfoManager userInfoManager,- UserManager userManager, SettingManager settingManager, IssueAuthorizationManager authorizationManager,- TransactionManager transactionManager, ExecutorService executorService, Dao dao) {+ IssueWatchManager watchManager, UserInfoManager userInfoManager, UserManager userManager,+ SettingManager settingManager, IssueAuthorizationManager authorizationManager,+ TransactionManager transactionManager, Dao dao) {super(markdownManager, settingManager);this.mailManager = mailManager;- this.urlManager = urlManager;this.watchManager = watchManager;this.userInfoManager = userInfoManager;this.userManager = userManager;this.authorizationManager = authorizationManager;this.transactionManager = transactionManager;- this.executorService = executorService;this.dao = dao;}@Transactional@Listenpublic void on(IssueEvent event) {- Long issueId = event.getIssue().getId();-- transactionManager.runAfterCommit(new Runnable() {+ transactionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- executorService.execute(new Runnable() {-- @Override- public void run() {- LockUtils.call(Issue.getSerialLockName(issueId), true, new Callable<Void>() {-- @Override- public Void call() throws Exception {- transactionManager.run(new Runnable() {+ IssueEvent clone = (IssueEvent) event.cloneIn(dao);++ Issue issue = clone.getIssue();+ User user = clone.getUser();- @Override- public void run() {- IssueEvent clone = event.cloneIn(dao);-- Issue issue = clone.getIssue();- User user = clone.getUser();+ String url = event.getUrl();- String url;- if (clone instanceof IssueCommented)- url = urlManager.urlFor(((IssueCommented)clone).getComment());- else if (clone instanceof IssueChanged)- url = urlManager.urlFor(((IssueChanged)clone).getChange());- else- url = urlManager.urlFor(issue);+ String summary;+ if (user != null)+ summary = user.getDisplayName() + " " + clone.getActivity();+ else+ summary = StringUtils.capitalize(clone.getActivity());- String summary;- if (user != null)- summary = user.getDisplayName() + " " + clone.getActivity();- else- summary = StringUtils.capitalize(clone.getActivity());+ for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {- for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {-- @Override- protected Issue getEntity() {- return issue;- }-- @Override- protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {- return issue.getProject().getIssueQueryPersonalizations();- }+ @Override+ protected Issue getEntity() {+ return issue;+ }- @Override- protected EntityQuery<Issue> parse(String queryString) {- IssueQueryParseOption option = new IssueQueryParseOption().withCurrentUserCriteria(true);- return IssueQuery.parse(issue.getProject(), queryString, option, true);- }+ @Override+ protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {+ return issue.getProject().getIssueQueryPersonalizations();+ }- @Override- protected Collection<? extends NamedQuery> getNamedQueries() {- return issue.getProject().getNamedIssueQueries();- }-- }.getWatches().entrySet()) {- if (SecurityUtils.canAccess(entry.getKey().asSubject(), issue))- watchManager.watch(issue, entry.getKey(), entry.getValue());- }-- for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {+ @Override+ protected EntityQuery<Issue> parse(String queryString) {+ IssueQueryParseOption option = new IssueQueryParseOption().withCurrentUserCriteria(true);+ return IssueQuery.parse(issue.getProject(), queryString, option, true);+ }- @Override- protected Issue getEntity() {- return issue;- }+ @Override+ protected Collection<? extends NamedQuery> getNamedQueries() {+ return issue.getProject().getNamedIssueQueries();+ }++ }.getWatches().entrySet()) {+ if (SecurityUtils.canAccess(entry.getKey().asSubject(), issue))+ watchManager.watch(issue, entry.getKey(), entry.getValue());+ }++ for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {- @Override- protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {- return userManager.query().stream().map(it->it.getIssueQueryPersonalization()).collect(Collectors.toList());- }+ @Override+ protected Issue getEntity() {+ return issue;+ }- @Override- protected EntityQuery<Issue> parse(String queryString) {- IssueQueryParseOption option = new IssueQueryParseOption().withCurrentBuildCriteria(true);- return IssueQuery.parse(null, queryString, option, true);- }+ @Override+ protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {+ return userManager.query().stream().map(it->it.getIssueQueryPersonalization()).collect(Collectors.toList());+ }- @Override- protected Collection<? extends NamedQuery> getNamedQueries() {- return settingManager.getIssueSetting().getNamedQueries();- }-- }.getWatches().entrySet()) {- if (SecurityUtils.canAccess(entry.getKey().asSubject(), issue))- watchManager.watch(issue, entry.getKey(), entry.getValue());- }-- Collection<User> notifiedUsers = Sets.newHashSet();- if (user != null) {- notifiedUsers.add(user); // no need to notify the user generating the event- if (!user.isSystem())- watchManager.watch(issue, user, true);- }+ @Override+ protected EntityQuery<Issue> parse(String queryString) {+ IssueQueryParseOption option = new IssueQueryParseOption().withCurrentBuildCriteria(true);+ return IssueQuery.parse(null, queryString, option, true);+ }- Map<String, Group> newGroups = clone.getNewGroups();- Map<String, Collection<User>> newUsers = clone.getNewUsers();-- String replyAddress = mailManager.getReplyAddress(issue);- boolean replyable = replyAddress != null;- for (Map.Entry<String, Group> entry: newGroups.entrySet()) {- String subject = String.format("[Issue %s] (%s: You) %s", issue.getFQN(), entry.getKey(), issue.getTitle());- String threadingReferences = String.format("<you-in-field-%s-%s@onedev>", entry.getKey(), issue.getUUID());- for (User member: entry.getValue().getMembers()) {- if (!member.equals(user)) {- EmailAddress emailAddress = member.getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified()) {- mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),- Lists.newArrayList(), Lists.newArrayList(), subject,- getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),- getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),- replyAddress, threadingReferences);- }- }- }-- for (User member: entry.getValue().getMembers()) {- watchManager.watch(issue, member, true);- authorizationManager.authorize(issue, member);- }-- notifiedUsers.addAll(entry.getValue().getMembers());- }-- for (Map.Entry<String, Collection<User>> entry: newUsers.entrySet()) {- String subject = String.format("[Issue %s] (%s: You) %s", issue.getFQN(), entry.getKey(), issue.getTitle());- String threadingReferences = String.format("<you-in-field-%s-%s@onedev>", entry.getKey(), issue.getUUID());- for (User member: entry.getValue()) {- if (!member.equals(user)) {- EmailAddress emailAddress = member.getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified()) {- mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),- Lists.newArrayList(), Lists.newArrayList(), subject,- getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),- getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),- replyAddress, threadingReferences);- }- }- }-- for (User each: entry.getValue()) {- watchManager.watch(issue, each, true);- authorizationManager.authorize(issue, each);- }- notifiedUsers.addAll(entry.getValue());- }-- Collection<String> notifiedEmailAddresses;- if (clone instanceof IssueCommented)- notifiedEmailAddresses = ((IssueCommented) clone).getNotifiedEmailAddresses();- else- notifiedEmailAddresses = new ArrayList<>();-- if (clone.getRenderedMarkdown() != null) {- for (String userName: new MentionParser().parseMentions(clone.getRenderedMarkdown())) {- User mentionedUser = userManager.findByName(userName);- if (mentionedUser != null) {- watchManager.watch(issue, mentionedUser, true);- authorizationManager.authorize(issue, mentionedUser);- if (!isNotified(notifiedEmailAddresses, mentionedUser)) {- String subject = String.format("[Issue %s] (Mentioned You) %s", issue.getFQN(), issue.getTitle());- String threadingReferences = String.format("<mentioned-%s@onedev>", issue.getUUID());-- EmailAddress emailAddress = mentionedUser.getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified()) {- mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),- Sets.newHashSet(), Sets.newHashSet(), subject,- getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),- getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),- replyAddress, threadingReferences);- }- notifiedUsers.add(mentionedUser);- }- }- }- }+ @Override+ protected Collection<? extends NamedQuery> getNamedQueries() {+ return settingManager.getIssueSetting().getNamedQueries();+ }++ }.getWatches().entrySet()) {+ if (SecurityUtils.canAccess(entry.getKey().asSubject(), issue))+ watchManager.watch(issue, entry.getKey(), entry.getValue());+ }++ Collection<User> notifiedUsers = Sets.newHashSet();+ if (user != null) {+ notifiedUsers.add(user); // no need to notify the user generating the event+ if (!user.isSystem())+ watchManager.watch(issue, user, true);+ }- if (!(clone instanceof IssueChanged)- || !(((IssueChanged) clone).getChange().getData() instanceof ReferencedFromAware)) {- Collection<String> bccEmailAddresses = new HashSet<>();-- for (IssueWatch watch: issue.getWatches()) {- Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);- if (watch.isWatching()- && (visitDate == null || visitDate.before(clone.getDate()))- && !notifiedUsers.contains(watch.getUser())- && !isNotified(notifiedEmailAddresses, watch.getUser())- && SecurityUtils.canAccess(watch.getUser().asSubject(), issue)) {- EmailAddress emailAddress = watch.getUser().getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified())- bccEmailAddresses.add(emailAddress.getValue());- }- }-- if (!bccEmailAddresses.isEmpty()) {- String subject = String.format("[Issue %s] (%s) %s",- issue.getFQN(), (clone instanceof IssueOpened)?"Opened":"Updated", issue.getTitle());-- Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(issue));- String htmlBody = getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, unsubscribable);- String textBody = getTextBody(clone, summary, clone.getTextBody(), url, replyable, unsubscribable);-- String threadingReferences = issue.getEffectiveThreadingReference();- mailManager.sendMailAsync(Sets.newHashSet(), Sets.newHashSet(),- bccEmailAddresses, subject, htmlBody, textBody,- replyAddress, threadingReferences);- }- }- }-- });- return null;+ Map<String, Group> newGroups = clone.getNewGroups();+ Map<String, Collection<User>> newUsers = clone.getNewUsers();++ String replyAddress = mailManager.getReplyAddress(issue);+ boolean replyable = replyAddress != null;+ for (Map.Entry<String, Group> entry: newGroups.entrySet()) {+ String subject = String.format("[Issue %s] (%s: You) %s", issue.getFQN(), entry.getKey(), issue.getTitle());+ String threadingReferences = String.format("<you-in-field-%s-%s@onedev>", entry.getKey(), issue.getUUID());+ for (User member: entry.getValue().getMembers()) {+ if (!member.equals(user)) {+ EmailAddress emailAddress = member.getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified()) {+ mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),+ Lists.newArrayList(), Lists.newArrayList(), subject,+ getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),+ getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),+ replyAddress, threadingReferences);}-- });+ }}- });+ for (User member: entry.getValue().getMembers()) {+ watchManager.watch(issue, member, true);+ authorizationManager.authorize(issue, member);+ }++ notifiedUsers.addAll(entry.getValue().getMembers());+ }++ for (Map.Entry<String, Collection<User>> entry: newUsers.entrySet()) {+ String subject = String.format("[Issue %s] (%s: You) %s", issue.getFQN(), entry.getKey(), issue.getTitle());+ String threadingReferences = String.format("<you-in-field-%s-%s@onedev>", entry.getKey(), issue.getUUID());+ for (User member: entry.getValue()) {+ if (!member.equals(user)) {+ EmailAddress emailAddress = member.getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified()) {+ mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),+ Lists.newArrayList(), Lists.newArrayList(), subject,+ getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),+ getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),+ replyAddress, threadingReferences);+ }+ }+ }++ for (User each: entry.getValue()) {+ watchManager.watch(issue, each, true);+ authorizationManager.authorize(issue, each);+ }+ notifiedUsers.addAll(entry.getValue());+ }++ Collection<String> notifiedEmailAddresses;+ if (clone instanceof IssueCommented)+ notifiedEmailAddresses = ((IssueCommented) clone).getNotifiedEmailAddresses();+ else+ notifiedEmailAddresses = new ArrayList<>();++ if (clone.getRenderedMarkdown() != null) {+ for (String userName: new MentionParser().parseMentions(clone.getRenderedMarkdown())) {+ User mentionedUser = userManager.findByName(userName);+ if (mentionedUser != null) {+ watchManager.watch(issue, mentionedUser, true);+ authorizationManager.authorize(issue, mentionedUser);+ if (!isNotified(notifiedEmailAddresses, mentionedUser)) {+ String subject = String.format("[Issue %s] (Mentioned You) %s", issue.getFQN(), issue.getTitle());+ String threadingReferences = String.format("<mentioned-%s@onedev>", issue.getUUID());++ EmailAddress emailAddress = mentionedUser.getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified()) {+ mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),+ Sets.newHashSet(), Sets.newHashSet(), subject,+ getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),+ getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),+ replyAddress, threadingReferences);+ }+ notifiedUsers.add(mentionedUser);+ }+ }+ }+ }- }+ if (!(clone instanceof IssueChanged)+ || !(((IssueChanged) clone).getChange().getData() instanceof ReferencedFromAware)) {+ Collection<String> bccEmailAddresses = new HashSet<>();++ for (IssueWatch watch: issue.getWatches()) {+ Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);+ if (watch.isWatching()+ && (visitDate == null || visitDate.before(clone.getDate()))+ && !notifiedUsers.contains(watch.getUser())+ && !isNotified(notifiedEmailAddresses, watch.getUser())+ && SecurityUtils.canAccess(watch.getUser().asSubject(), issue)) {+ EmailAddress emailAddress = watch.getUser().getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified())+ bccEmailAddresses.add(emailAddress.getValue());+ }+ }- });+ if (!bccEmailAddresses.isEmpty()) {+ String subject = String.format("[Issue %s] (%s) %s",+ issue.getFQN(), (clone instanceof IssueOpened)?"Opened":"Updated", issue.getTitle());++ Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(issue));+ String htmlBody = getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, unsubscribable);+ String textBody = getTextBody(clone, summary, clone.getTextBody(), url, replyable, unsubscribable);++ String threadingReferences = issue.getEffectiveThreadingReference();+ mailManager.sendMailAsync(Sets.newHashSet(), Sets.newHashSet(),+ bccEmailAddresses, subject, htmlBody, textBody,+ replyAddress, threadingReferences);+ }+ }+ }++ }, LockUtils.getLock(Issue.getSerialLockName(event.getIssue().getId()), true));}diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.javaindex 17a58970aa..5129d446fa 100644--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java@@ -6,8 +6,6 @@ import java.util.Date;import java.util.HashSet;import java.util.Map;import java.util.Set;-import java.util.concurrent.Callable;-import java.util.concurrent.ExecutorService;import java.util.stream.Collectors;import javax.inject.Inject;@@ -24,14 +22,10 @@ import io.onedev.commons.loader.Listen;import io.onedev.commons.utils.LockUtils;import io.onedev.server.entitymanager.PullRequestWatchManager;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.pullrequest.PullRequestAssigned;import io.onedev.server.event.pullrequest.PullRequestBuildEvent;import io.onedev.server.event.pullrequest.PullRequestChanged;-import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated;-import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied;-import io.onedev.server.event.pullrequest.PullRequestCodeCommentStatusChanged;import io.onedev.server.event.pullrequest.PullRequestCommented;import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;@@ -73,8 +67,6 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerprivate final MailManager mailManager;- private final UrlManager urlManager;-private final PullRequestWatchManager pullRequestWatchManager;private final UserInfoManager userInfoManager;@@ -83,324 +75,284 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerprivate final TransactionManager transactionManager;- private final ExecutorService executorService;-private final Dao dao;@Inject- public PullRequestNotificationManager(MailManager mailManager, UrlManager urlManager,- MarkdownManager markdownManager, PullRequestWatchManager pullRequestWatchManager,- UserInfoManager userInfoManager, UserManager userManager, SettingManager settingManager,- TransactionManager transactionManager, ExecutorService executorService, Dao dao) {+ public PullRequestNotificationManager(MailManager mailManager, MarkdownManager markdownManager,+ PullRequestWatchManager pullRequestWatchManager, UserInfoManager userInfoManager,+ UserManager userManager, SettingManager settingManager, TransactionManager transactionManager,+ Dao dao) {super(markdownManager, settingManager);this.mailManager = mailManager;- this.urlManager = urlManager;this.pullRequestWatchManager = pullRequestWatchManager;this.userInfoManager = userInfoManager;this.userManager = userManager;this.transactionManager = transactionManager;- this.executorService = executorService;this.dao = dao;}@Transactional@Listenpublic void on(PullRequestEvent event) {- Long requestId = event.getRequest().getId();-- transactionManager.runAfterCommit(new Runnable() {+ transactionManager.runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- executorService.execute(new Runnable() {-- @Override- public void run() {- LockUtils.call(PullRequest.getSerialLockName(requestId), true, new Callable<Void>() {-- @Override- public Void call() throws Exception {- transactionManager.run(new Runnable() {+ PullRequestEvent clone = (PullRequestEvent) event.cloneIn(dao);+ PullRequest request = clone.getRequest();+ User user = clone.getUser();- @Override- public void run() {- PullRequestEvent clone = event.cloneIn(dao);- PullRequest request = clone.getRequest();- User user = clone.getUser();+ String url = clone.getUrl();++ for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {- String url;- if (clone instanceof PullRequestCommented)- url = urlManager.urlFor(((PullRequestCommented)clone).getComment());- else if (clone instanceof PullRequestChanged)- url = urlManager.urlFor(((PullRequestChanged)clone).getChange());- else if (clone instanceof PullRequestCodeCommentCreated)- url = urlManager.urlFor(((PullRequestCodeCommentCreated)clone).getComment());- else if (clone instanceof PullRequestCodeCommentReplied)- url = urlManager.urlFor(((PullRequestCodeCommentReplied)clone).getReply());- else if (clone instanceof PullRequestCodeCommentStatusChanged)- url = urlManager.urlFor(((PullRequestCodeCommentStatusChanged)clone).getChange());- else- url = urlManager.urlFor(request);-- for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {-- @Override- protected PullRequest getEntity() {- return request;- }-- @Override- protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {- return request.getTargetProject().getPullRequestQueryPersonalizations();- }+ @Override+ protected PullRequest getEntity() {+ return request;+ }- @Override- protected EntityQuery<PullRequest> parse(String queryString) {- return PullRequestQuery.parse(request.getTargetProject(), queryString);- }+ @Override+ protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {+ return request.getTargetProject().getPullRequestQueryPersonalizations();+ }- @Override- protected Collection<? extends NamedQuery> getNamedQueries() {- return request.getTargetProject().getNamedPullRequestQueries();- }-- }.getWatches().entrySet()) {- pullRequestWatchManager.watch(request, entry.getKey(), entry.getValue());- }-- for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {+ @Override+ protected EntityQuery<PullRequest> parse(String queryString) {+ return PullRequestQuery.parse(request.getTargetProject(), queryString, true);+ }- @Override- protected PullRequest getEntity() {- return request;- }+ @Override+ protected Collection<? extends NamedQuery> getNamedQueries() {+ return request.getTargetProject().getNamedPullRequestQueries();+ }++ }.getWatches().entrySet()) {+ pullRequestWatchManager.watch(request, entry.getKey(), entry.getValue());+ }++ for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {- @Override- protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {- return userManager.query().stream().map(it->it.getPullRequestQueryPersonalization()).collect(Collectors.toList());- }+ @Override+ protected PullRequest getEntity() {+ return request;+ }- @Override- protected EntityQuery<PullRequest> parse(String queryString) {- return PullRequestQuery.parse(null, queryString);- }+ @Override+ protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {+ return userManager.query().stream().map(it->it.getPullRequestQueryPersonalization()).collect(Collectors.toList());+ }- @Override- protected Collection<? extends NamedQuery> getNamedQueries() {- return settingManager.getPullRequestSetting().getNamedQueries();- }-- }.getWatches().entrySet()) {- pullRequestWatchManager.watch(request, entry.getKey(), entry.getValue());- }-- Collection<User> notifiedUsers = Sets.newHashSet();- if (user != null) {- notifiedUsers.add(user); // no need to notify the user generating the event- if (!user.isSystem())- pullRequestWatchManager.watch(request, user, true);- }-- User committer = null;- if (clone instanceof PullRequestUpdated) {- PullRequestUpdated pullRequestUpdated = (PullRequestUpdated) clone;- Collection<User> committers = pullRequestUpdated.getCommitters();- if (committers.size() == 1) {- committer = committers.iterator().next();- notifiedUsers.add(committer);- }- for (User each: committers) {- if (!each.isSystem())- pullRequestWatchManager.watch(request, each, true);- }- }-- String summary;- if (user != null)- summary = user.getDisplayName() + " " + clone.getActivity();- else if (committer != null)- summary = committer.getDisplayName() + " " + clone.getActivity();- else- summary = StringUtils.capitalize(clone.getActivity());-- String replyAddress = mailManager.getReplyAddress(request);- boolean replyable = replyAddress != null;-- Set<User> reviewers = new HashSet<>();- Set<User> assignees = new HashSet<>();- if (clone instanceof PullRequestOpened) {- for (PullRequestReview review: request.getReviews()) {- if (review.getStatus() == Status.PENDING)- reviewers.add(review.getUser());- }- for (PullRequestAssignment assignment: request.getAssignments())- assignees.add(assignment.getUser());- } else if (clone instanceof PullRequestChanged) {- PullRequestChanged changeEvent = (PullRequestChanged) clone;- PullRequestChangeData changeData = changeEvent.getChange().getData();- if ((changeData instanceof PullRequestApproveData- || changeData instanceof PullRequestRequestedForChangesData- || changeData instanceof PullRequestDiscardData)- && request.getSubmitter() != null && !notifiedUsers.contains(request.getSubmitter())) {- String subject = String.format("[Pull Request %s] (%s) %s", request.getFQN(),- WordUtils.capitalize(changeData.getActivity()), request.getTitle());- String threadingReferences = String.format("<%s-%s@onedev>",- changeData.getActivity().replace(' ', '-'), request.getUUID());- EmailAddress emailAddress = request.getSubmitter().getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified()) {- mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),- Lists.newArrayList(), Lists.newArrayList(), subject,- getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),- getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),- replyAddress, threadingReferences);- }- notifiedUsers.add(request.getSubmitter());- }- } else if (clone instanceof PullRequestAssigned) {- assignees.add(((PullRequestAssigned) clone).getAssignee());- } else if (clone instanceof PullRequestReviewRequested) {- reviewers.add(((PullRequestReviewRequested) clone).getReviewer());- }+ @Override+ protected EntityQuery<PullRequest> parse(String queryString) {+ return PullRequestQuery.parse(null, queryString, true);+ }- for (User assignee: assignees) {- pullRequestWatchManager.watch(request, assignee, true);- if (!notifiedUsers.contains(assignee)) {- String subject = String.format("[Pull Request %s] (Assigned) %s",- request.getFQN(), request.getTitle());- String threadingReferences = String.format("<assigned-%s@onedev>", request.getUUID());- String assignmentSummary;- if (user != null)- assignmentSummary = user.getDisplayName() + " assigned to you";- else- assignmentSummary = "Assigned to you";- EmailAddress emailAddress = assignee.getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified()) {- mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),- Lists.newArrayList(), Lists.newArrayList(), subject,- getHtmlBody(clone, assignmentSummary, clone.getHtmlBody(), url, replyable, null),- getTextBody(clone, assignmentSummary, clone.getTextBody(), url, replyable, null),- replyAddress, threadingReferences);- }- notifiedUsers.add(assignee);- }- }+ @Override+ protected Collection<? extends NamedQuery> getNamedQueries() {+ return settingManager.getPullRequestSetting().getNamedQueries();+ }++ }.getWatches().entrySet()) {+ pullRequestWatchManager.watch(request, entry.getKey(), entry.getValue());+ }++ Collection<User> notifiedUsers = Sets.newHashSet();+ if (user != null) {+ notifiedUsers.add(user); // no need to notify the user generating the event+ if (!user.isSystem())+ pullRequestWatchManager.watch(request, user, true);+ }++ User committer = null;+ if (clone instanceof PullRequestUpdated) {+ PullRequestUpdated pullRequestUpdated = (PullRequestUpdated) clone;+ Collection<User> committers = pullRequestUpdated.getCommitters();+ if (committers.size() == 1) {+ committer = committers.iterator().next();+ notifiedUsers.add(committer);+ }+ for (User each: committers) {+ if (!each.isSystem())+ pullRequestWatchManager.watch(request, each, true);+ }+ }++ String summary;+ if (user != null)+ summary = user.getDisplayName() + " " + clone.getActivity();+ else if (committer != null)+ summary = committer.getDisplayName() + " " + clone.getActivity();+ else+ summary = StringUtils.capitalize(clone.getActivity());++ String replyAddress = mailManager.getReplyAddress(request);+ boolean replyable = replyAddress != null;++ Set<User> reviewers = new HashSet<>();+ Set<User> assignees = new HashSet<>();+ if (clone instanceof PullRequestOpened) {+ for (PullRequestReview review: request.getReviews()) {+ if (review.getStatus() == Status.PENDING)+ reviewers.add(review.getUser());+ }+ for (PullRequestAssignment assignment: request.getAssignments())+ assignees.add(assignment.getUser());+ } else if (clone instanceof PullRequestChanged) {+ PullRequestChanged changeEvent = (PullRequestChanged) clone;+ PullRequestChangeData changeData = changeEvent.getChange().getData();+ if ((changeData instanceof PullRequestApproveData+ || changeData instanceof PullRequestRequestedForChangesData+ || changeData instanceof PullRequestDiscardData)+ && request.getSubmitter() != null && !notifiedUsers.contains(request.getSubmitter())) {+ String subject = String.format("[Pull Request %s] (%s) %s", request.getFQN(),+ WordUtils.capitalize(changeData.getActivity()), request.getTitle());+ String threadingReferences = String.format("<%s-%s@onedev>",+ changeData.getActivity().replace(' ', '-'), request.getUUID());+ EmailAddress emailAddress = request.getSubmitter().getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified()) {+ mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),+ Lists.newArrayList(), Lists.newArrayList(), subject,+ getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),+ getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),+ replyAddress, threadingReferences);+ }+ notifiedUsers.add(request.getSubmitter());+ }+ } else if (clone instanceof PullRequestAssigned) {+ assignees.add(((PullRequestAssigned) clone).getAssignee());+ } else if (clone instanceof PullRequestReviewRequested) {+ reviewers.add(((PullRequestReviewRequested) clone).getReviewer());+ }- for (User reviewer: reviewers) {- pullRequestWatchManager.watch(request, reviewer, true);- if (!notifiedUsers.contains(reviewer)) {- String subject = String.format("[Pull Request %s] (Review Request) %s",- request.getFQN(), request.getTitle());- String threadingReferences = String.format("<review-invitation-%s@onedev>", request.getUUID());- String reviewInvitationSummary;- if (user != null)- reviewInvitationSummary = user.getDisplayName() + " requested review from you";- else- reviewInvitationSummary = "Requested review from you";-- EmailAddress emailAddress = reviewer.getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified()) {- mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),- Lists.newArrayList(), Lists.newArrayList(), subject,- getHtmlBody(clone, reviewInvitationSummary, clone.getHtmlBody(), url, replyable, null),- getTextBody(clone, reviewInvitationSummary, clone.getTextBody(), url, replyable, null),- replyAddress, threadingReferences);- }- notifiedUsers.add(reviewer);- }- }-- Collection<String> notifiedEmailAddresses;- if (clone instanceof PullRequestCommented)- notifiedEmailAddresses = ((PullRequestCommented) clone).getNotifiedEmailAddresses();- else- notifiedEmailAddresses = new ArrayList<>();-- if (clone.getRenderedMarkdown() != null) {- for (String userName: new MentionParser().parseMentions(clone.getRenderedMarkdown())) {- User mentionedUser = userManager.findByName(userName);- if (mentionedUser != null) {- pullRequestWatchManager.watch(request, mentionedUser, true);- if (!isNotified(notifiedEmailAddresses, mentionedUser)) {- String subject = String.format("[Pull Request %s] (Mentioned You) %s", request.getFQN(), request.getTitle());- String threadingReferences = String.format("<mentioned-%s@onedev>", request.getUUID());-- EmailAddress emailAddress = mentionedUser.getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified()) {- mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),- Sets.newHashSet(), Sets.newHashSet(), subject,- getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),- getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),- replyAddress, threadingReferences);- }- notifiedUsers.add(mentionedUser);- }- }- }- }-- boolean notifyWatchers = false;- if (clone instanceof PullRequestChanged) {- PullRequestChangeData changeData = ((PullRequestChanged) clone).getChange().getData();- if (changeData instanceof PullRequestApproveData- || changeData instanceof PullRequestRequestedForChangesData- || changeData instanceof PullRequestMergeData- || changeData instanceof PullRequestDiscardData- || changeData instanceof PullRequestReopenData) {- notifyWatchers = true;- }- } else if (!(clone instanceof PullRequestMergePreviewCalculated- || clone instanceof PullRequestBuildEvent- || clone instanceof PullRequestReviewRequested- || clone instanceof PullRequestReviewerRemoved- || clone instanceof PullRequestAssigned- || clone instanceof PullRequestUnassigned)) {- notifyWatchers = true;- }-- if (notifyWatchers) {- Collection<String> bccEmailAddresses = new HashSet<>();-- for (PullRequestWatch watch: request.getWatches()) {- Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);- Permission permission = new ProjectPermission(request.getProject(), new ReadCode());- if (watch.isWatching()- && (visitDate == null || visitDate.before(clone.getDate()))- && (!(clone instanceof PullRequestUpdated) || !watch.getUser().equals(request.getSubmitter()))- && !notifiedUsers.contains(watch.getUser())- && !isNotified(notifiedEmailAddresses, watch.getUser())- && watch.getUser().asSubject().isPermitted(permission)) {- EmailAddress emailAddress = watch.getUser().getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified())- bccEmailAddresses.add(emailAddress.getValue());- }- }+ for (User assignee: assignees) {+ pullRequestWatchManager.watch(request, assignee, true);+ if (!notifiedUsers.contains(assignee)) {+ String subject = String.format("[Pull Request %s] (Assigned) %s",+ request.getFQN(), request.getTitle());+ String threadingReferences = String.format("<assigned-%s@onedev>", request.getUUID());+ String assignmentSummary;+ if (user != null)+ assignmentSummary = user.getDisplayName() + " assigned to you";+ else+ assignmentSummary = "Assigned to you";+ EmailAddress emailAddress = assignee.getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified()) {+ mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),+ Lists.newArrayList(), Lists.newArrayList(), subject,+ getHtmlBody(clone, assignmentSummary, clone.getHtmlBody(), url, replyable, null),+ getTextBody(clone, assignmentSummary, clone.getTextBody(), url, replyable, null),+ replyAddress, threadingReferences);+ }+ notifiedUsers.add(assignee);+ }+ }- if (!bccEmailAddresses.isEmpty()) {- String subject = String.format("[Pull Request %s] (%s) %s",- request.getFQN(), (clone instanceof PullRequestOpened)?"Opened":"Updated", request.getTitle());- String threadingReferences = "<" + request.getUUID() + "@onedev>";- Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(request));- String htmlBody = getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, unsubscribable);- String textBody = getTextBody(clone, summary, clone.getTextBody(), url, replyable, unsubscribable);- mailManager.sendMailAsync(- Lists.newArrayList(), Lists.newArrayList(),- bccEmailAddresses, subject, htmlBody, textBody,- replyAddress, threadingReferences);- }- }- }-- });- return null;- }-- });+ for (User reviewer: reviewers) {+ pullRequestWatchManager.watch(request, reviewer, true);+ if (!notifiedUsers.contains(reviewer)) {+ String subject = String.format("[Pull Request %s] (Review Request) %s",+ request.getFQN(), request.getTitle());+ String threadingReferences = String.format("<review-invitation-%s@onedev>", request.getUUID());+ String reviewInvitationSummary;+ if (user != null)+ reviewInvitationSummary = user.getDisplayName() + " requested review from you";+ else+ reviewInvitationSummary = "Requested review from you";++ EmailAddress emailAddress = reviewer.getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified()) {+ mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),+ Lists.newArrayList(), Lists.newArrayList(), subject,+ getHtmlBody(clone, reviewInvitationSummary, clone.getHtmlBody(), url, replyable, null),+ getTextBody(clone, reviewInvitationSummary, clone.getTextBody(), url, replyable, null),+ replyAddress, threadingReferences);+ }+ notifiedUsers.add(reviewer);+ }+ }++ Collection<String> notifiedEmailAddresses;+ if (clone instanceof PullRequestCommented)+ notifiedEmailAddresses = ((PullRequestCommented) clone).getNotifiedEmailAddresses();+ else+ notifiedEmailAddresses = new ArrayList<>();++ if (clone.getRenderedMarkdown() != null) {+ for (String userName: new MentionParser().parseMentions(clone.getRenderedMarkdown())) {+ User mentionedUser = userManager.findByName(userName);+ if (mentionedUser != null) {+ pullRequestWatchManager.watch(request, mentionedUser, true);+ if (!isNotified(notifiedEmailAddresses, mentionedUser)) {+ String subject = String.format("[Pull Request %s] (Mentioned You) %s", request.getFQN(), request.getTitle());+ String threadingReferences = String.format("<mentioned-%s@onedev>", request.getUUID());++ EmailAddress emailAddress = mentionedUser.getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified()) {+ mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),+ Sets.newHashSet(), Sets.newHashSet(), subject,+ getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, null),+ getTextBody(clone, summary, clone.getTextBody(), url, replyable, null),+ replyAddress, threadingReferences);+ }+ notifiedUsers.add(mentionedUser);+ }+ }}+ }++ boolean notifyWatchers = false;+ if (clone instanceof PullRequestChanged) {+ PullRequestChangeData changeData = ((PullRequestChanged) clone).getChange().getData();+ if (changeData instanceof PullRequestApproveData+ || changeData instanceof PullRequestRequestedForChangesData+ || changeData instanceof PullRequestMergeData+ || changeData instanceof PullRequestDiscardData+ || changeData instanceof PullRequestReopenData) {+ notifyWatchers = true;+ }+ } else if (!(clone instanceof PullRequestMergePreviewCalculated+ || clone instanceof PullRequestBuildEvent+ || clone instanceof PullRequestReviewRequested+ || clone instanceof PullRequestReviewerRemoved+ || clone instanceof PullRequestAssigned+ || clone instanceof PullRequestUnassigned)) {+ notifyWatchers = true;+ }++ if (notifyWatchers) {+ Collection<String> bccEmailAddresses = new HashSet<>();- });+ for (PullRequestWatch watch: request.getWatches()) {+ Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);+ Permission permission = new ProjectPermission(request.getProject(), new ReadCode());+ if (watch.isWatching()+ && (visitDate == null || visitDate.before(clone.getDate()))+ && (!(clone instanceof PullRequestUpdated) || !watch.getUser().equals(request.getSubmitter()))+ && !notifiedUsers.contains(watch.getUser())+ && !isNotified(notifiedEmailAddresses, watch.getUser())+ && watch.getUser().asSubject().isPermitted(permission)) {+ EmailAddress emailAddress = watch.getUser().getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified())+ bccEmailAddresses.add(emailAddress.getValue());+ }+ }++ if (!bccEmailAddresses.isEmpty()) {+ String subject = String.format("[Pull Request %s] (%s) %s",+ request.getFQN(), (clone instanceof PullRequestOpened)?"Opened":"Updated", request.getTitle());+ String threadingReferences = "<" + request.getUUID() + "@onedev>";+ Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(request));+ String htmlBody = getHtmlBody(clone, summary, clone.getHtmlBody(), url, replyable, unsubscribable);+ String textBody = getTextBody(clone, summary, clone.getTextBody(), url, replyable, unsubscribable);+ mailManager.sendMailAsync(+ Lists.newArrayList(), Lists.newArrayList(),+ bccEmailAddresses, subject, htmlBody, textBody,+ replyAddress, threadingReferences);+ }+ }}- });+ }, LockUtils.getLock(PullRequest.getSerialLockName(event.getRequest().getId()), false));}diff --git a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.javaindex 9063240585..bd70d7569c 100644--- a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java@@ -9,8 +9,8 @@ import javax.inject.Singleton;import javax.ws.rs.core.HttpHeaders;import javax.ws.rs.core.MediaType;-import org.apache.commons.httpclient.HttpStatus;import org.apache.http.HttpEntity;+import org.apache.http.HttpStatus;import org.apache.http.client.methods.CloseableHttpResponse;import org.apache.http.client.methods.HttpPost;import org.apache.http.entity.StringEntity;diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.javaindex 8a11424cbd..6d9d038be6 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.java@@ -2,7 +2,9 @@ package io.onedev.server.persistence;import java.util.concurrent.Callable;import java.util.concurrent.ExecutorService;+import java.util.concurrent.locks.Lock;+import javax.annotation.Nullable;import javax.inject.Provider;import org.hibernate.FlushMode;@@ -25,6 +27,8 @@ public class DefaultSessionManager implements SessionManager {private final ExecutorService executorService;+ private final TransactionManager transactionManager;+private final ThreadLocal<ObjectReference<Session>> sessionReferenceHolder = new ThreadLocal<ObjectReference<Session>>() {@Override@@ -51,9 +55,11 @@ public class DefaultSessionManager implements SessionManager {};@Inject- public DefaultSessionManager(Provider<PersistManager> persistManagerProvider, ExecutorService executorService) {+ public DefaultSessionManager(Provider<PersistManager> persistManagerProvider, ExecutorService executorService,+ TransactionManager transactionManager) {this.persistManagerProvider = persistManagerProvider;this.executorService = executorService;+ this.transactionManager = transactionManager;}@Override@@ -105,19 +111,50 @@ public class DefaultSessionManager implements SessionManager {}@Override- public void runAsync(Runnable runnable) {+ public void runAsync(Runnable runnable, @Nullable Lock lock) {executorService.execute(new Runnable() {@Overridepublic void run() {try {- DefaultSessionManager.this.run(runnable);+ if (lock != null) {+ try {+ lock.lockInterruptibly();+ DefaultSessionManager.this.run(runnable);+ } finally {+ lock.unlock();+ }+ } else {+ DefaultSessionManager.this.run(runnable);+ }} catch (Exception e) {- logger.error("Error running", e);+ logger.error("Error executing in session", e);}}});}+ @Override+ public void runAsync(Runnable runnable) {+ runAsync(runnable, null);+ }++ @Override+ public void runAsyncAfterCommit(Runnable runnable, Lock lock) {+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ runAsync(runnable, lock);+ }++ });+ }++ @Override+ public void runAsyncAfterCommit(Runnable runnable) {+ runAsyncAfterCommit(runnable, null);+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.javaindex d26c064d1f..9a9ee7a3af 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java@@ -22,7 +22,9 @@ import java.util.Map;import java.util.concurrent.Callable;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.ExecutorService;+import java.util.concurrent.locks.Lock;+import javax.annotation.Nullable;import javax.inject.Singleton;import javax.persistence.FlushModeType;import javax.transaction.Status;@@ -108,12 +110,39 @@ public class DefaultTransactionManager implements TransactionManager {}@Override- public void runAsync(Runnable runnable) {+ public void runAsync(Runnable runnable, @Nullable Lock lock) {executorService.execute(new Runnable() {@Overridepublic void run() {- DefaultTransactionManager.this.run(runnable);+ try {+ if (lock != null) {+ try {+ lock.lockInterruptibly();+ DefaultTransactionManager.this.run(runnable);+ } catch (InterruptedException e) {+ throw new RuntimeException(e);+ } finally {+ lock.unlock();+ }+ } else {+ DefaultTransactionManager.this.run(runnable);+ }+ } catch (Exception e) {+ logger.error("Error executing in transaction", e);+ }+ }++ });+ }++ @Override+ public void runAsyncAfterCommit(Runnable runnable, @Nullable Lock lock) {+ runAfterCommit(new Runnable() {++ @Override+ public void run() {+ runAsync(runnable, lock);}});@@ -134,7 +163,7 @@ public class DefaultTransactionManager implements TransactionManager {try {runnable.run();} catch (Exception e) {- logger.error("Error running", e);+ logger.error("Error executing after commit", e);}}}@@ -166,5 +195,15 @@ public class DefaultTransactionManager implements TransactionManager {}runnables.add(runnable);}++ @Override+ public void runAsync(Runnable runnable) {+ runAsync(runnable, null);+ }++ @Override+ public void runAsyncAfterCommit(Runnable runnable) {+ runAsyncAfterCommit(runnable, null);+ }}diff --git a/server-core/src/main/java/io/onedev/server/persistence/SessionManager.java b/server-core/src/main/java/io/onedev/server/persistence/SessionManager.javaindex b6111913ee..1f9f97894a 100644--- a/server-core/src/main/java/io/onedev/server/persistence/SessionManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/SessionManager.java@@ -17,6 +17,9 @@package io.onedev.server.persistence;import java.util.concurrent.Callable;+import java.util.concurrent.locks.Lock;++import javax.annotation.Nullable;import org.hibernate.Session;@@ -30,8 +33,14 @@ public interface SessionManager {void run(Runnable runnable);+ void runAsync(Runnable runnable, @Nullable Lock lock);+void runAsync(Runnable runnable);+ void runAsyncAfterCommit(Runnable runnable, @Nullable Lock lock);++ void runAsyncAfterCommit(Runnable runnable);+Session getSession();}diff --git a/server-core/src/main/java/io/onedev/server/persistence/TransactionManager.java b/server-core/src/main/java/io/onedev/server/persistence/TransactionManager.javaindex 6a17e58894..f8ed69b89c 100644--- a/server-core/src/main/java/io/onedev/server/persistence/TransactionManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/TransactionManager.java@@ -17,6 +17,9 @@package io.onedev.server.persistence;import java.util.concurrent.Callable;+import java.util.concurrent.locks.Lock;++import javax.annotation.Nullable;import org.hibernate.Session;import org.hibernate.Transaction;@@ -31,8 +34,14 @@ public interface TransactionManager {void run(Runnable runnable);+ void runAsync(Runnable runnable, @Nullable Lock lock);++ void runAsyncAfterCommit(Runnable runnable, @Nullable Lock lock);+void runAsync(Runnable runnable);+ void runAsyncAfterCommit(Runnable runnable);+/*** Do some work after commit if there is an active transaction, or do the work immediately if there is no active* transaction. Note that the work should not involve any other database operations in current threaddiff --git a/server-core/src/main/java/io/onedev/server/rest/CodeCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/CodeCommentResource.javaindex a6c755468b..e006434983 100644--- a/server-core/src/main/java/io/onedev/server/rest/CodeCommentResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/CodeCommentResource.java@@ -109,7 +109,7 @@ public class CodeCommentResource {CodeCommentQuery parsedQuery;try {- parsedQuery = CodeCommentQuery.parse(null, query);+ parsedQuery = CodeCommentQuery.parse(null, query, true);} catch (Exception e) {throw new InvalidParamException("Error parsing query", e);}diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.javaindex f5df3afef9..17cb6ec7be 100644--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java@@ -187,7 +187,7 @@ public class PullRequestResource {PullRequestQuery parsedQuery;try {- parsedQuery = PullRequestQuery.parse(null, query);+ parsedQuery = PullRequestQuery.parse(null, query, true);} catch (Exception e) {throw new InvalidParamException("Error parsing query", e);}diff --git a/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.java b/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.javaindex 257e025eb6..69d256865e 100644--- a/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.java@@ -295,7 +295,7 @@ public class RepositoryResource {CommitQuery parsedQuery;try {- parsedQuery = CommitQuery.parse(project, query);+ parsedQuery = CommitQuery.parse(project, query, true);} catch (Exception e) {throw new InvalidParamException("Error parsing query", e);}diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.javaindex 9437721f6a..89f3e9314c 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java@@ -38,7 +38,7 @@ public class CommitQuery implements Serializable {this.criterias = criterias;}- public static CommitQuery parse(Project project, @Nullable String queryString) {+ public static CommitQuery parse(Project project, @Nullable String queryString, boolean withCurrentUserCriteria) {List<CommitCriteria> criterias = new ArrayList<>();if (queryString != null) {CharStream is = CharStreams.fromString(queryString);@@ -68,15 +68,21 @@ public class CommitQuery implements Serializable {for (CriteriaContext criteria: parser.query().criteria()) {if (criteria.authorCriteria() != null) {- if (criteria.authorCriteria().AuthoredByMe() != null)+ if (criteria.authorCriteria().AuthoredByMe() != null) {+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + criteria.authorCriteria().AuthoredByMe().getText() + "' is not supported here");authorValues.add(null);- else+ } else {authorValues.add(getValue(criteria.authorCriteria().Value()));+ }} else if (criteria.committerCriteria() != null) {- if (criteria.committerCriteria().CommittedByMe() != null)+ if (criteria.committerCriteria().CommittedByMe() != null) {+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + criteria.committerCriteria().CommittedByMe().getText() + "' is not supported here");committerValues.add(null);- else+ } else {committerValues.add(getValue(criteria.committerCriteria().Value()));+ }} else if (criteria.messageCriteria() != null) {messageValues.add(getValue(criteria.messageCriteria().Value()));} else if (criteria.pathCriteria() != null) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4index 1fe9799969..78e2255ad3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4@@ -7,7 +7,7 @@ query;criteria- : operator=(Successful|Failed|Cancelled|Running|Waiting|Pending|TimedOut|SubmittedByMe|CancelledByMe) #OperatorCriteria+ : operator=(Successful|Failed|Cancelled|Running|Finished|Waiting|Pending|TimedOut|SubmittedByMe|CancelledByMe) #OperatorCriteria| criteriaField=Quoted WS+ operator=IsEmpty #FieldOperatorCriteria| operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|InPipelineOf|RanOn) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria@@ -36,6 +36,10 @@ CancelledTimedOut: 'timed' WS+ 'out';++Finished+ : 'finished'+ ;Running: 'running'diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex a2d6d5b6a3..0a56e58047 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -113,6 +113,10 @@ public class BuildQuery extends EntityQuery<Build> {return new CancelledCriteria();case BuildQueryLexer.TimedOut:return new TimedOutCriteria();+ case BuildQueryLexer.Finished:+ if (!withUnfinishedCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new FinishedCriteria();case BuildQueryLexer.Waiting:if (!withUnfinishedCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.javanew file mode 100644index 0000000000..f6c74cee5a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishedCriteria.java@@ -0,0 +1,39 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class FinishedCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {+ Path<?> attribute = from.get(Build.PROP_STATUS);+ return builder.or(+ builder.equal(attribute, Build.Status.SUCCESSFUL),+ builder.equal(attribute, Build.Status.FAILED),+ builder.equal(attribute, Build.Status.TIMED_OUT),+ builder.equal(attribute, Build.Status.CANCELLED));+ }++ @Override+ public boolean matches(Build build) {+ return build.getStatus() == Build.Status.SUCCESSFUL+ || build.getStatus() == Build.Status.FAILED+ || build.getStatus() == Build.Status.TIMED_OUT+ || build.getStatus() == Build.Status.CANCELLED;+ }++ @Override+ public String toStringWithoutParens() {+ return BuildQuery.getRuleName(BuildQueryLexer.Running);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.javaindex db6f018438..5171f86feb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java@@ -67,7 +67,8 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {this(null);}- public static CodeCommentQuery parse(Project project, @Nullable String queryString) {+ public static CodeCommentQuery parse(Project project, @Nullable String queryString,+ boolean withCurrentUserCriteria) {if (queryString != null) {CharStream is = CharStreams.fromString(queryString);CodeCommentQueryLexer lexer = new CodeCommentQueryLexer(is);@@ -99,6 +100,8 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {case CodeCommentQueryLexer.Unresolved:return new UnresolvedCriteria();default:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new CreatedByMeCriteria();}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex 20b94a8c17..11a11f52b8 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -57,7 +57,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {this(null);}- public static PullRequestQuery parse(@Nullable Project project, @Nullable String queryString) {+ public static PullRequestQuery parse(@Nullable Project project, @Nullable String queryString, boolean withCurrentUserCriteria) {if (queryString != null) {CharStream is = CharStreams.fromString(queryString);PullRequestQueryLexer lexer = new PullRequestQueryLexer(is);@@ -91,14 +91,24 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {case PullRequestQueryLexer.Discarded:return new DiscardedCriteria();case PullRequestQueryLexer.SubmittedByMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new SubmittedByMeCriteria();case PullRequestQueryLexer.ToBeReviewedByMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new ToBeReviewedByMeCriteria();case PullRequestQueryLexer.RequestedForChangesByMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new RequestedForChangesByMeCriteria();case PullRequestQueryLexer.ApprovedByMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new ApprovedByMeCriteria();case PullRequestQueryLexer.AssignedToMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new AssignedToMeCriteria();case PullRequestQueryLexer.SomeoneRequestedForChanges:return new SomeoneRequestedForChangesCriteria();diff --git a/server-core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.javaindex e2657e1569..95c09e4917 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java@@ -23,7 +23,7 @@ public class CodeCommentQueryValidator implements ConstraintValidator<CodeCommen} else {Project project = Project.get();try {- io.onedev.server.search.entity.codecomment.CodeCommentQuery.parse(project, value);+ io.onedev.server.search.entity.codecomment.CodeCommentQuery.parse(project, value, true);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.javaindex 7100f50372..19862c0a87 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.java@@ -22,7 +22,7 @@ public class CommitQueryValidator implements ConstraintValidator<CommitQuery, Streturn true;} else {try {- io.onedev.server.search.commit.CommitQuery.parse(Project.get(), value);+ io.onedev.server.search.commit.CommitQuery.parse(Project.get(), value, true);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.javaindex e62a1a30dd..d60ebcbee6 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java@@ -23,7 +23,7 @@ public class PullRequestQueryValidator implements ConstraintValidator<PullReques} else {Project project = Project.get();try {- io.onedev.server.search.entity.pullrequest.PullRequestQuery.parse(project, value);+ io.onedev.server.search.entity.pullrequest.PullRequestQuery.parse(project, value, true);return true;} catch (Exception e) {constraintContext.disableDefaultConstraintViolation();diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.javaindex 7f4735bcf8..dcbb1fb1ba 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java@@ -1,5 +1,8 @@package io.onedev.server.web.behavior;+import static io.onedev.server.search.entity.codecomment.CodeCommentQuery.*;+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer.*;+import java.util.ArrayList;import java.util.List;@@ -32,9 +35,15 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {private final IModel<Project> projectModel;- public CodeCommentQueryBehavior(IModel<Project> projectModel) {+ private final boolean withCurrentUserCriteria;++ private final boolean withOrder;++ public CodeCommentQueryBehavior(IModel<Project> projectModel, boolean withCurrentUserCriteria, boolean withOrder) {super(CodeCommentQueryParser.class, "query", false);this.projectModel = projectModel;+ this.withCurrentUserCriteria = withCurrentUserCriteria;+ this.withOrder = withOrder;}@Override@@ -105,6 +114,11 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {+ if (!withOrder && suggestedLiteral.equals(getRuleName(OrderBy))+ || !withCurrentUserCriteria && suggestedLiteral.equals(getRuleName(CreatedByMe))) {+ return null;+ }+parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.javaindex 222931d8a6..e0b44be490 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java@@ -35,14 +35,17 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {private final IModel<Project> projectModel;+ private final boolean withCurrentUserCriteria;+private static final List<String> DATE_EXAMPLES = Lists.newArrayList("one hour ago", "2 hours ago", "3PM", "noon", "today", "yesterday","yesterday midnight", "3 days ago", "last week", "last Monday","4 weeks ago", "1 month 2 days ago", "1 year ago");- public CommitQueryBehavior(IModel<Project> projectModel) {+ public CommitQueryBehavior(IModel<Project> projectModel, boolean withCurrentUserCriteria) {super(CommitQueryParser.class, "query", false);this.projectModel = projectModel;+ this.withCurrentUserCriteria = withCurrentUserCriteria;}@Override@@ -136,6 +139,10 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {+ if (!withCurrentUserCriteria+ && (suggestedLiteral.equals("authored-by-me") || suggestedLiteral.equals("committed-by-me"))) {+ return null;+ }String description;switch (suggestedLiteral) {case "committer":diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex 800d93f758..e2a269fe51 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -1,6 +1,6 @@package io.onedev.server.web.behavior;-import static io.onedev.server.model.Issue.NAME_NUMBER;+import static io.onedev.server.model.PullRequest.NAME_NUMBER;import java.util.ArrayList;import java.util.List;@@ -24,8 +24,8 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.search.entity.project.ProjectQuery;-import io.onedev.server.search.entity.pullrequest.PullRequestQuery;-import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;+import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.*;+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.*;import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser;import io.onedev.server.util.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;@@ -37,9 +37,15 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {private final IModel<Project> projectModel;- public PullRequestQueryBehavior(IModel<Project> projectModel) {+ private final boolean withCurrentUserCriteria;++ private final boolean withOrder;++ public PullRequestQueryBehavior(IModel<Project> projectModel, boolean withCurrentUserCriteria, boolean withOrder) {super(PullRequestQueryParser.class, "query", false);this.projectModel = projectModel;+ this.withCurrentUserCriteria = withCurrentUserCriteria;+ this.withOrder = withOrder;}@Override@@ -77,18 +83,18 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);Preconditions.checkState(operatorElements.size() == 1);String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());- int operator = PullRequestQuery.getOperator(operatorName);+ int operator = getOperator(operatorName);if (fieldElements.isEmpty()) {- if (operator == PullRequestQueryLexer.IncludesIssue)+ if (operator == IncludesIssue)return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);- else if (operator != PullRequestQueryLexer.IncludesCommit)+ else if (operator != IncludesCommit)return SuggestionUtils.suggestUsers(matchWith);elsereturn null;} else {- String fieldName = PullRequestQuery.getValue(fieldElements.get(0).getMatchedText());+ String fieldName = getValue(fieldElements.get(0).getMatchedText());try {- PullRequestQuery.checkField(fieldName, operator);+ checkField(fieldName, operator);if (fieldName.equals(PullRequest.NAME_SUBMIT_DATE)|| fieldName.equals(PullRequest.NAME_UPDATE_DATE)|| fieldName.equals(PullRequest.NAME_CLOSE_DATE)) {@@ -144,13 +150,22 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {+ if (!withOrder && suggestedLiteral.equals(getRuleName(OrderBy))+ || !withCurrentUserCriteria && (suggestedLiteral.equals(getRuleName(SubmittedByMe))+ || suggestedLiteral.equals(getRuleName(ToBeReviewedByMe))+ || suggestedLiteral.equals(getRuleName(RequestedForChangesByMe))+ || suggestedLiteral.equals(getRuleName(ApprovedByMe))+ || suggestedLiteral.equals(getRuleName(AssignedToMe)))) {+ return null;+ }+parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);if (!fieldElements.isEmpty()) {- String fieldName = PullRequestQuery.getValue(fieldElements.iterator().next().getMatchedText());+ String fieldName = getValue(fieldElements.iterator().next().getMatchedText());try {- PullRequestQuery.checkField(fieldName, PullRequestQuery.getOperator(suggestedLiteral));+ checkField(fieldName, getOperator(suggestedLiteral));} catch (ExplicitException e) {return null;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex 1ce472167f..78487e109f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -98,7 +98,7 @@ public abstract class CodeCommentListPanel extends Panel {protected Object load() {String queryString = queryStringModel.getObject();try {- return CodeCommentQuery.parse(getProject(), queryString);+ return CodeCommentQuery.parse(getProject(), queryString, true);} catch (ExplicitException e) {error(e.getMessage());return null;@@ -632,7 +632,7 @@ public abstract class CodeCommentListPanel extends Panel {return getProject();}- }) {+ }, true, true) {@Overrideprotected void onInput(AjaxRequestTarget target, String inputContent) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 83478f5288..93a7a25edc 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -107,7 +107,7 @@ public abstract class CommitListPanel extends Panel {getFeedbackMessages().clear();String queryString = queryStringModel.getObject();try {- return CommitQuery.merge(getBaseQuery(), CommitQuery.parse(getProject(), queryString));+ return CommitQuery.merge(getBaseQuery(), CommitQuery.parse(getProject(), queryString, true));} catch (ExplicitException e) {error(e.getMessage());return null;@@ -345,7 +345,7 @@ public abstract class CommitListPanel extends Panel {return getProject();}- }) {+ }, true) {@Overrideprotected void onInput(AjaxRequestTarget target, String inputContent) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 0cbc1b8629..447100cb2a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -85,7 +85,6 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;import io.onedev.server.persistence.SessionManager;-import io.onedev.server.persistence.TransactionManager;import io.onedev.server.search.code.CodeIndexManager;import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.security.SecurityUtils;@@ -503,21 +502,14 @@ public abstract class RevisionDiffPanel extends Panel {Long projectId = request.getSourceProject().getId();String refName = GitUtils.branch2ref(request.getSourceBranch());- OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {+ OneDev.getInstance(SessionManager.class).runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {-- @Override- public void run() {- Project project = OneDev.getInstance(ProjectManager.class).load(projectId);- project.cacheObjectId(request.getSourceBranch(), newCommitId);- RefUpdated refUpdated = new RefUpdated(project, refName, commitId, newCommitId);- OneDev.getInstance(ListenerRegistry.class).post(refUpdated);- }-- });+ Project project = OneDev.getInstance(ProjectManager.class).load(projectId);+ project.cacheObjectId(request.getSourceBranch(), newCommitId);+ RefUpdated refUpdated = new RefUpdated(project, refName, commitId, newCommitId);+ OneDev.getInstance(ListenerRegistry.class).post(refUpdated);}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex 9d6f937efe..a0dfa06cd0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -150,7 +150,7 @@ public abstract class PullRequestListPanel extends Panel {@Nullableprivate Object parse(@Nullable String queryString, PullRequestQuery baseQuery) {try {- return PullRequestQuery.merge(baseQuery, PullRequestQuery.parse(getProject(), queryString));+ return PullRequestQuery.merge(baseQuery, PullRequestQuery.parse(getProject(), queryString, true));} catch (ExplicitException e) {error(e.getMessage());return null;@@ -581,7 +581,7 @@ public abstract class PullRequestListPanel extends Panel {return getProject();}- }) {+ }, true, true) {@Overrideprotected void onInput(AjaxRequestTarget target, String inputContent) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.javaindex 1d976ed6cf..3bb37f125a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyModalPanel.java@@ -27,7 +27,6 @@ import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;import io.onedev.server.model.support.administration.GpgSetting;import io.onedev.server.persistence.SessionManager;-import io.onedev.server.persistence.TransactionManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectAndRevision;import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;@@ -87,21 +86,14 @@ public abstract class SuggestionApplyModalPanel extends BeanEditModalPanel<SuggeLong projectId = project.getId();String refName = GitUtils.branch2ref(branch);- OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {+ OneDev.getInstance(SessionManager.class).runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {-- @Override- public void run() {- Project project = OneDev.getInstance(ProjectManager.class).load(projectId);- project.cacheObjectId(branch, newCommitId);- RefUpdated refUpdated = new RefUpdated(project, refName, commitId, newCommitId);- OneDev.getInstance(ListenerRegistry.class).post(refUpdated);- }-- });+ Project project = OneDev.getInstance(ProjectManager.class).load(projectId);+ project.cacheObjectId(branch, newCommitId);+ RefUpdated refUpdated = new RefUpdated(project, refName, commitId, newCommitId);+ OneDev.getInstance(ListenerRegistry.class).post(refUpdated);}});diff --git a/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.javaindex d50a4dbc38..5d3d8bac2a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.java@@ -22,7 +22,8 @@ public class CodeCommentQueryEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {Method propertyGetter = descriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(CodeCommentQuery.class) != null) {+ CodeCommentQuery codeCommentQuery = propertyGetter.getAnnotation(CodeCommentQuery.class);+ if (codeCommentQuery != null) {if (propertyGetter.getReturnType() != String.class) {throw new RuntimeException("Annotation 'CodeCommentQuery' should be applied to property "+ "with type 'String'");@@ -62,7 +63,7 @@ public class CodeCommentQueryEditSupport implements EditSupport {return ((ProjectPage) WicketUtils.getPage()).getProject();}- });+ }, codeCommentQuery.withCurrentUserCriteria(), codeCommentQuery.withOrder());return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(inputAssist);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.javaindex bf6d0abdec..69ce664c63 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.java@@ -22,7 +22,8 @@ public class CommitQueryEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {Method propertyGetter = descriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(CommitQuery.class) != null) {+ CommitQuery commitQuery = propertyGetter.getAnnotation(CommitQuery.class);+ if (commitQuery != null) {if (propertyGetter.getReturnType() != String.class) {throw new RuntimeException("Annotation 'CommitQuery' should be applied to property "+ "with type 'String'");@@ -62,7 +63,7 @@ public class CommitQueryEditSupport implements EditSupport {return ((ProjectPage) WicketUtils.getPage()).getProject();}- });+ }, commitQuery.withCurrentUserCriteria());return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(inputAssist);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/CodeCommentQuery.javaindex d360ac1898..046842ed04 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/CodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/CodeCommentQuery.java@@ -15,6 +15,10 @@ import io.onedev.server.util.validation.CodeCommentQueryValidator;@Constraint(validatedBy=CodeCommentQueryValidator.class)public @interface CodeCommentQuery {+ boolean withCurrentUserCriteria() default false;++ boolean withOrder() default true;+String message() default "";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/CommitQuery.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/CommitQuery.javaindex 79621e254b..4bbbc83393 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/CommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/CommitQuery.java@@ -14,6 +14,8 @@ import io.onedev.server.util.validation.CommitQueryValidator;@Retention(RetentionPolicy.RUNTIME)@Constraint(validatedBy=CommitQueryValidator.class)public @interface CommitQuery {+ boolean withCurrentUserCriteria() default false;+String message() default "";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/PullRequestQuery.javaindex 46109ac123..05df684cbe 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/PullRequestQuery.java@@ -15,6 +15,10 @@ import io.onedev.server.util.validation.PullRequestQueryValidator;@Constraint(validatedBy=PullRequestQueryValidator.class)public @interface PullRequestQuery {+ boolean withCurrentUserCriteria() default false;++ boolean withOrder() default true;+String message() default "";Class<?>[] groups() default {};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Vertical.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Vertical.javaindex 02773a9890..b62b9c9019 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Vertical.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Vertical.java@@ -10,3 +10,4 @@ import java.lang.annotation.Target;public @interface Vertical {}+\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.htmlindex e131b000c6..993b5ba7ee 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html@@ -1,7 +1,7 @@<wicket:panel><div class="bean-list"><table wicket:id="table">- <thead>+ <thead wicket:id="thead"><th class="actions minimum"></th><th wicket:id="headers"><span wicket:id="header"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.javaindex d0c5fe983b..48306ebe3b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java@@ -117,7 +117,10 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {};add(table);- table.add(new ListView<PropertyContext<Serializable>>("headers", propertyContexts) {+ WebMarkupContainer thead = new WebMarkupContainer("thead");+ table.add(thead);++ thead.add(new ListView<PropertyContext<Serializable>>("headers", propertyContexts) {@Overrideprotected void populateItem(ListItem<PropertyContext<Serializable>> item) {@@ -143,6 +146,7 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {}});+ thead.setVisible(propertyContexts.size() > 1);rows = new RepeatingView("elements");table.add(rows);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.htmlindex a2a2e39a05..8c5b0c9365 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html@@ -1,6 +1,6 @@<wicket:panel><table wicket:id="table" class="bean-list">- <thead>+ <thead wicket:id="thead"><th wicket:id="headers"><span wicket:id="header"></span></th>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.javaindex 70bbf53e27..004445df35 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java@@ -69,7 +69,10 @@ public class BeanListPropertyViewer extends Panel {};add(table);- table.add(new ListView<PropertyContext<Serializable>>("headers", propertyContexts) {+ WebMarkupContainer thead = new WebMarkupContainer("thead");+ table.add(thead);++ thead.add(new ListView<PropertyContext<Serializable>>("headers", propertyContexts) {@Overrideprotected void populateItem(ListItem<PropertyContext<Serializable>> item) {@@ -79,6 +82,7 @@ public class BeanListPropertyViewer extends Panel {}});+ thead.setVisible(propertyContexts.size() > 1);table.add(new ListView<Serializable>("rows", elements) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.cssindex 8b3572f362..7932c18d54 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css@@ -99,6 +99,24 @@.editable table tr:last-child td:last-child {border-bottom-right-radius: 0.42rem;}+.editable table tr:first-child td {+ border-top: 1px dashed var(--secondary);+}+.editable table tr:first-child td:first-child {+ border-top-left-radius: 0.42rem;+}+.editable table tr:first-child td:last-child {+ border-top-right-radius: 0.42rem;+}+.editable table thead+tbody tr:first-child td {+ border-top: none;+}+.editable table thead+tbody tr:first-child td:first-child {+ border-top-left-radius: 0;+}+.editable table thead+tbody tr:first-child td:last-child {+ border-top-right-radius: 0;+}.editable .polymorphic>.type-selector {margin-bottom: 1rem;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.javaindex 5b7dd9be85..081f3f06f7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.java@@ -25,7 +25,8 @@ public class PullRequestQueryEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {Method propertyGetter = descriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(PullRequestQuery.class) != null) {+ PullRequestQuery pullRequestQuery = propertyGetter.getAnnotation(PullRequestQuery.class);+ if (pullRequestQuery != null) {if (propertyGetter.getReturnType() != String.class) {throw new RuntimeException("Annotation 'PullRequestQuery' should be applied to property "+ "with type 'String'");@@ -66,8 +67,9 @@ public class PullRequestQueryEditSupport implements EditSupport {}};- return new StringPropertyEditor(componentId, descriptor, model)- .setInputAssist(new PullRequestQueryBehavior(projectModel));+ PullRequestQueryBehavior behavior = new PullRequestQueryBehavior(+ projectModel, pullRequestQuery.withCurrentUserCriteria(), pullRequestQuery.withOrder());+ return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(behavior);}};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 b466694a5d..11e7fefcd5 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@@ -86,7 +86,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.persistence.SessionManager;-import io.onedev.server.persistence.TransactionManager;import io.onedev.server.search.code.CodeIndexManager;import io.onedev.server.search.code.CodeSearchManager;import io.onedev.server.search.code.CommitIndexed;@@ -1414,21 +1413,14 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,OneDev.getInstance(PullRequestUpdateManager.class).checkUpdate(request);}- OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {+ OneDev.getInstance(SessionManager.class).runAsyncAfterCommit(new Runnable() {@Overridepublic void run() {- OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {-- @Override- public void run() {- Project project = OneDev.getInstance(ProjectManager.class).load(projectId);- project.cacheObjectId(branch, newCommitId);- RefUpdated refUpdated = new RefUpdated(project, refName, oldCommitId, newCommitId);- OneDev.getInstance(ListenerRegistry.class).post(refUpdated);- }-- });+ Project project = OneDev.getInstance(ProjectManager.class).load(projectId);+ project.cacheObjectId(branch, newCommitId);+ RefUpdated refUpdated = new RefUpdated(project, refName, oldCommitId, newCommitId);+ OneDev.getInstance(ListenerRegistry.class).post(refUpdated);}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 54d52d0a70..c44d110080 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -962,7 +962,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected EntityQuery<PullRequest> parse(String queryString, Project project) {- return PullRequestQuery.parse(project, queryString);+ return PullRequestQuery.parse(project, queryString, true);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.htmlindex e6d2c988e3..31ed539e04 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.html@@ -12,6 +12,7 @@<input wicket:id="enable" type="checkbox" class="enable"></label></span>+ <div wicket:id="feedback"></div><div wicket:id="editor" class="mb-4"></div><input type="submit" class="btn btn-primary dirty-aware mr-1" value="Save Setting"></form>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.javaindex dfabd6e878..8cf525395b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java@@ -8,6 +8,7 @@ import javax.validation.Validator;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.CheckBox;@@ -137,6 +138,8 @@ public class ContributedProjectSettingPage extends ProjectSettingPage {Serializable setting = getProject().getContributedSetting(settingClass);form.add(newBeanEditor(setting));+ form.add(new FencedFeedbackPanel("feedback", form));+add(form);}diff --git a/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.java b/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.javaindex dc9e7ecf31..5429e2bcae 100644--- a/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.java+++ b/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.java@@ -55,20 +55,20 @@ public class CommitQueryTest extends AbstractGitTest {User.push(user);try {- assertTrue(CommitQuery.parse(project, null).matches(event));- assertFalse(CommitQuery.parse(project, "branch(dev)").matches(event));- assertTrue(CommitQuery.parse(project, "default-branch").matches(event));- assertTrue(CommitQuery.parse(project, "branch(master) path(master/*)").matches(event));- assertFalse(CommitQuery.parse(project, "path(master/file)").matches(event));- assertTrue(CommitQuery.parse(project, "path(master/)").matches(event));- assertTrue(CommitQuery.parse(project, "path(master/file) path(master/file*)").matches(event));- assertTrue(CommitQuery.parse(project, "message(dev) message(master)").matches(event));- assertTrue(CommitQuery.parse(project, "message(dev) message(m*s)").matches(event));- assertTrue(CommitQuery.parse(project, "authored-by-me author([email protected])").matches(event));- assertFalse(CommitQuery.parse(project, "authored-by-me committer([email protected])").matches(event));- assertTrue(CommitQuery.parse(project, "authored-by-me committer([email protected])").matches(event));- assertTrue(CommitQuery.parse(project, "after(2 days ago) after(1 hour ago)").matches(event));- assertFalse(CommitQuery.parse(project, "before(1 hour ago) after(1 day ago)").matches(event));+ assertTrue(CommitQuery.parse(project, null, true).matches(event));+ assertFalse(CommitQuery.parse(project, "branch(dev)", true).matches(event));+ assertTrue(CommitQuery.parse(project, "default-branch", true).matches(event));+ assertTrue(CommitQuery.parse(project, "branch(master) path(master/*)", true).matches(event));+ assertFalse(CommitQuery.parse(project, "path(master/file)", true).matches(event));+ assertTrue(CommitQuery.parse(project, "path(master/)", true).matches(event));+ assertTrue(CommitQuery.parse(project, "path(master/file) path(master/file*)", true).matches(event));+ assertTrue(CommitQuery.parse(project, "message(dev) message(master)", true).matches(event));+ assertTrue(CommitQuery.parse(project, "message(dev) message(m*s)", true).matches(event));+ assertTrue(CommitQuery.parse(project, "authored-by-me author([email protected])", true).matches(event));+ assertFalse(CommitQuery.parse(project, "authored-by-me committer([email protected])", true).matches(event));+ assertTrue(CommitQuery.parse(project, "authored-by-me committer([email protected])", true).matches(event));+ assertTrue(CommitQuery.parse(project, "after(2 days ago) after(1 hour ago)", true).matches(event));+ assertFalse(CommitQuery.parse(project, "before(1 hour ago) after(1 day ago)", true).matches(event));} finally {User.pop();}diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex 6ed5cb9f29..0619cd8d0a 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -49,5 +49,6 @@<module>server-plugin-report-pmd</module><module>server-plugin-report-cpd</module><module>server-plugin-sso-discord</module>+ <module>server-plugin-notification-slack</module></modules></project>\ No newline at end of filediff --git a/server-plugin/server-plugin-notification-slack/pom.xml b/server-plugin/server-plugin-notification-slack/pom.xmlnew file mode 100644index 0000000000..912fe9179d--- /dev/null+++ b/server-plugin/server-plugin-notification-slack/pom.xml@@ -0,0 +1,13 @@+<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-plugin-notification-slack</artifactId>+ <parent>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin</artifactId>+ <version>7.4.29</version>+ </parent>+ <properties>+ <moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>+ </properties>+</project>diff --git a/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/ChannelNotification.java b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/ChannelNotification.javanew file mode 100644index 0000000000..0720bde4e9--- /dev/null+++ b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/ChannelNotification.java@@ -0,0 +1,228 @@+package io.onedev.server.plugin.notification.slack;++import java.io.Serializable;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.event.ProjectEvent;+import io.onedev.server.event.RefUpdated;+import io.onedev.server.event.build.BuildEvent;+import io.onedev.server.event.codecomment.CodeCommentEvent;+import io.onedev.server.event.issue.IssueEvent;+import io.onedev.server.event.pullrequest.PullRequestEvent;+import io.onedev.server.search.entity.issue.IssueQueryParseOption;+import io.onedev.server.util.EditContext;+import io.onedev.server.web.editable.annotation.BuildQuery;+import io.onedev.server.web.editable.annotation.CodeCommentQuery;+import io.onedev.server.web.editable.annotation.CommitQuery;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.IssueQuery;+import io.onedev.server.web.editable.annotation.PullRequestQuery;+import io.onedev.server.web.editable.annotation.ShowCondition;++@Editable+public class ChannelNotification implements Serializable {++ private static final long serialVersionUID = 1L;++ private String webhookUrl;++ private boolean issues;++ private String issueQuery;++ private boolean pullRequests;++ private String pullRequestQuery;++ private boolean builds;++ private String buildQuery;++ private boolean codePush;++ private String commitQuery;++ private boolean codeComments;++ private String codeCommentQuery;++ @Editable(order=50, description="Specify Slack webhook url to post events")+ @NotEmpty+ public String getWebhookUrl() {+ return webhookUrl;+ }++ public void setWebhookUrl(String webhookUrl) {+ this.webhookUrl = webhookUrl;+ }++ @Editable(order=100, name="Notify Issue Events")+ public boolean isIssues() {+ return issues;+ }++ public void setIssues(boolean issues) {+ this.issues = issues;+ }++ @Editable(order=200, name="Applicable Issues", placeholder="All")+ @IssueQuery(withOrder=false)+ @ShowCondition("isIssuesEnabled")+ public String getIssueQuery() {+ return issueQuery;+ }++ public void setIssueQuery(String issueQuery) {+ this.issueQuery = issueQuery;+ }++ @SuppressWarnings("unused")+ private static boolean isIssuesEnabled() {+ return (boolean) EditContext.get().getInputValue("issues");+ }++ @Editable(order=300, name="Notify Pull Request Events")+ public boolean isPullRequests() {+ return pullRequests;+ }++ public void setPullRequests(boolean pullRequests) {+ this.pullRequests = pullRequests;+ }++ @Editable(order=400, name="Applicable Pull Requests", placeholder="All")+ @PullRequestQuery(withOrder=false)+ @ShowCondition("isPullRequestsEnabled")+ public String getPullRequestQuery() {+ return pullRequestQuery;+ }++ public void setPullRequestQuery(String pullRequestQuery) {+ this.pullRequestQuery = pullRequestQuery;+ }++ @SuppressWarnings("unused")+ private static boolean isPullRequestsEnabled() {+ return (boolean) EditContext.get().getInputValue("pullRequests");+ }++ @Editable(order=500, name="Notify Build Events")+ public boolean isBuilds() {+ return builds;+ }++ public void setBuilds(boolean builds) {+ this.builds = builds;+ }++ @Editable(order=600, name="Applicable Builds", placeholder="All")+ @BuildQuery(withOrder=false, withUnfinishedCriteria=true)+ @ShowCondition("isBuildsEnabled")+ public String getBuildQuery() {+ return buildQuery;+ }++ public void setBuildQuery(String buildQuery) {+ this.buildQuery = buildQuery;+ }++ @SuppressWarnings("unused")+ private static boolean isBuildsEnabled() {+ return (boolean) EditContext.get().getInputValue("builds");+ }++ @Editable(order=700, name="Notify Code Push Events")+ public boolean isCodePush() {+ return codePush;+ }++ public void setCodePush(boolean codePush) {+ this.codePush = codePush;+ }++ @Editable(order=800, name="Applicable Commits", placeholder="All")+ @CommitQuery+ @ShowCondition("isCodePushEnabled")+ public String getCommitQuery() {+ return commitQuery;+ }++ public void setCommitQuery(String commitQuery) {+ this.commitQuery = commitQuery;+ }++ @SuppressWarnings("unused")+ private static boolean isCodePushEnabled() {+ return (boolean) EditContext.get().getInputValue("codePush");+ }++ @Editable(order=900, name="Notify Code Comment Events")+ public boolean isCodeComments() {+ return codeComments;+ }++ public void setCodeComments(boolean codeComments) {+ this.codeComments = codeComments;+ }++ @Editable(order=1000, name="Applicable Code Comments", placeholder="All")+ @CodeCommentQuery(withOrder=false)+ @ShowCondition("isCodeCommentsEnabled")+ public String getCodeCommentQuery() {+ return codeCommentQuery;+ }++ public void setCodeCommentQuery(String codeCommentQuery) {+ this.codeCommentQuery = codeCommentQuery;+ }++ @SuppressWarnings("unused")+ private static boolean isCodeCommentsEnabled() {+ return (boolean) EditContext.get().getInputValue("codeComments");+ }++ public boolean matches(ProjectEvent event) {+ if (event instanceof IssueEvent) {+ if (isIssues()) {+ IssueQueryParseOption option = new IssueQueryParseOption();+ option.withOrder(false);+ return io.onedev.server.search.entity.issue.IssueQuery.parse(event.getProject(), getIssueQuery(), option, true)+ .matches(((IssueEvent)event).getIssue());+ } else {+ return false;+ }+ } else if (event instanceof BuildEvent) {+ if (isBuilds()) {+ return io.onedev.server.search.entity.build.BuildQuery.parse(event.getProject(), getBuildQuery(), false, true)+ .matches(((BuildEvent)event).getBuild());+ } else {+ return false;+ }+ } else if (event instanceof PullRequestEvent) {+ if (isPullRequests()) {+ return io.onedev.server.search.entity.pullrequest.PullRequestQuery.parse(event.getProject(), getPullRequestQuery(), false)+ .matches(((PullRequestEvent)event).getRequest());+ } else {+ return false;+ }+ } else if (event instanceof RefUpdated) {+ if (isCodePush()) {+ return io.onedev.server.search.commit.CommitQuery.parse(event.getProject(), getCommitQuery(), false)+ .matches((RefUpdated)event);+ } else {+ return false;+ }+ } else if (event instanceof CodeCommentEvent) {+ if (isCodeComments()) {+ return io.onedev.server.search.entity.codecomment.CodeCommentQuery.parse(event.getProject(), getCodeCommentQuery(), false)+ .matches(((CodeCommentEvent)event).getComment());+ } else {+ return false;+ }+ } else {+ return false;+ }+ }++}\ No newline at end of filediff --git a/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/ChannelNotificationWrapper.java b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/ChannelNotificationWrapper.javanew file mode 100644index 0000000000..ff912bc531--- /dev/null+++ b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/ChannelNotificationWrapper.java@@ -0,0 +1,28 @@+package io.onedev.server.plugin.notification.slack;++import java.io.Serializable;++import javax.validation.constraints.NotNull;++import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;++@Editable+public class ChannelNotificationWrapper implements Serializable {++ private static final long serialVersionUID = 1L;++ private ChannelNotification channelNotification = new ChannelNotification();++ @Editable+ @OmitName+ @NotNull+ public ChannelNotification getChannelNotification() {+ return channelNotification;+ }++ public void setChannelNotification(ChannelNotification channelNotification) {+ this.channelNotification = channelNotification;+ }++}\ No newline at end of filediff --git a/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackModule.java b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackModule.javanew file mode 100644index 0000000000..e0fc72cc2b--- /dev/null+++ b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackModule.java@@ -0,0 +1,34 @@+package io.onedev.server.plugin.notification.slack;++import java.util.List;++import com.beust.jcommander.internal.Lists;++import io.onedev.commons.loader.AbstractPluginModule;+import io.onedev.server.web.page.project.setting.ContributedProjectSetting;+import io.onedev.server.web.page.project.setting.ProjectSettingContribution;++/**+ * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.+ *+ */+public class SlackModule extends AbstractPluginModule {++ @Override+ protected void configure() {+ super.configure();++ // put your guice bindings here+ contribute(ProjectSettingContribution.class, new ProjectSettingContribution() {++ @SuppressWarnings("unchecked")+ @Override+ public List<Class<? extends ContributedProjectSetting>> getSettingClasses() {+ return Lists.newArrayList(SlackNotificationSetting.class);+ }++ });+ bind(SlackNotificationManager.class);+ }++}diff --git a/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationManager.java b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationManager.javanew file mode 100644index 0000000000..91e43ead24--- /dev/null+++ b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationManager.java@@ -0,0 +1,446 @@+package io.onedev.server.plugin.notification.slack;++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.Set;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.apache.commons.lang3.StringUtils;+import org.apache.http.HttpStatus;+import org.apache.http.client.methods.CloseableHttpResponse;+import org.apache.http.client.methods.HttpPost;+import org.apache.http.entity.ContentType;+import org.apache.http.entity.StringEntity;+import org.apache.http.impl.client.CloseableHttpClient;+import org.apache.http.impl.client.HttpClients;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;+import org.jetbrains.annotations.NotNull;+import org.jetbrains.annotations.Nullable;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.fasterxml.jackson.databind.ObjectMapper;+import com.nimbusds.jose.util.IOUtils;+import com.vladsch.flexmark.ast.Emphasis;+import com.vladsch.flexmark.ast.Image;+import com.vladsch.flexmark.ast.InlineLinkNode;+import com.vladsch.flexmark.ast.Link;+import com.vladsch.flexmark.ast.StrongEmphasis;+import com.vladsch.flexmark.formatter.Formatter;+import com.vladsch.flexmark.formatter.Formatter.Builder;+import com.vladsch.flexmark.formatter.Formatter.FormatterExtension;+import com.vladsch.flexmark.formatter.MarkdownWriter;+import com.vladsch.flexmark.formatter.NodeFormatter;+import com.vladsch.flexmark.formatter.NodeFormatterContext;+import com.vladsch.flexmark.formatter.NodeFormatterFactory;+import com.vladsch.flexmark.formatter.NodeFormattingHandler;+import com.vladsch.flexmark.formatter.NodeFormattingHandler.CustomNodeFormatter;+import com.vladsch.flexmark.parser.Parser;+import com.vladsch.flexmark.util.ast.Node;+import com.vladsch.flexmark.util.data.DataHolder;+import com.vladsch.flexmark.util.data.MutableDataHolder;++import io.onedev.commons.loader.Listen;+import io.onedev.commons.utils.LockUtils;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entityreference.ReferencedFromAware;+import io.onedev.server.event.ProjectEvent;+import io.onedev.server.event.RefUpdated;+import io.onedev.server.event.build.BuildEvent;+import io.onedev.server.event.codecomment.CodeCommentEvent;+import io.onedev.server.event.codecomment.CodeCommentUpdated;+import io.onedev.server.event.issue.IssueChanged;+import io.onedev.server.event.issue.IssueEvent;+import io.onedev.server.event.pullrequest.PullRequestAssigned;+import io.onedev.server.event.pullrequest.PullRequestBuildEvent;+import io.onedev.server.event.pullrequest.PullRequestChanged;+import io.onedev.server.event.pullrequest.PullRequestEvent;+import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;+import io.onedev.server.event.pullrequest.PullRequestReviewRequested;+import io.onedev.server.event.pullrequest.PullRequestReviewerRemoved;+import io.onedev.server.event.pullrequest.PullRequestUnassigned;+import io.onedev.server.git.GitUtils;+import io.onedev.server.mail.MailManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;+import io.onedev.server.notification.ActivityDetail;+import io.onedev.server.persistence.SessionManager;+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.util.CollectionUtils;+import io.onedev.server.web.resource.AttachmentResource;++@Singleton+public class SlackNotificationManager {++ private static final Logger logger = LoggerFactory.getLogger(SlackNotificationManager.class);++ private final Dao dao;++ private final SessionManager sessionManager;++ private final ObjectMapper objectMapper;++ private final SettingManager settingManager;++ private final MailManager mailManager;++ @Inject+ public SlackNotificationManager(ObjectMapper objectMapper, Dao dao, SessionManager sessionManager,+ SettingManager settingManager, MailManager mailManager) {+ this.objectMapper = objectMapper;+ this.dao = dao;+ this.sessionManager = sessionManager;+ this.settingManager = settingManager;+ this.mailManager = mailManager;+ }++ private Collection<ChannelNotification> getNotifications(Project project) {+ Map<String, ChannelNotification> notifications = new HashMap<>();+ do {+ SlackNotificationSetting setting = project.getContributedSetting(SlackNotificationSetting.class);+ for (ChannelNotificationWrapper wrapper: setting.getNotifications())+ notifications.putIfAbsent(wrapper.getChannelNotification().getWebhookUrl(), wrapper.getChannelNotification());+ project = project.getParent();+ } while (project != null);++ return notifications.values();+ }++ private String toMrkdwn(String markdown) {+ Parser parser = Parser.builder().build();+ Node node = parser.parse(markdown);++ Collection<FormatterExtension> extensions = new ArrayList<>();+ extensions.add(new FormatterExtension() {++ @Override+ public void rendererOptions(MutableDataHolder options) {+ }++ @Override+ public void extend(Builder formatterBuilder) {+ formatterBuilder.nodeFormatterFactory(new NodeFormatterFactory() {++ @Override+ public @NotNull NodeFormatter create(@NotNull DataHolder options) {+ return new NodeFormatter() {++ private void renderInlineLink(@NotNull InlineLinkNode node, @NotNull NodeFormatterContext context,+ @NotNull MarkdownWriter markdown) {+ markdown.append("<");+ String url = node.getUrl().toString();+ if (url.startsWith("/")) {+ url = settingManager.getSystemSetting().getServerUrl() + url;+ markdown.append(AttachmentResource.authorizeGroup(url));+ } else {+ markdown.append(url);+ }+ markdown.append("|");+ context.renderChildren(node);+ markdown.append(">");+ }++ @Override+ public @Nullable Set<NodeFormattingHandler<?>> getNodeFormattingHandlers() {+ Set<NodeFormattingHandler<?>> handlers = new HashSet<>();+ handlers.add(new NodeFormattingHandler<>(Emphasis.class, new CustomNodeFormatter<Emphasis>() {++ @Override+ public void render(@NotNull Emphasis node, @NotNull NodeFormatterContext context,+ @NotNull MarkdownWriter markdown) {+ markdown.append("_");+ context.renderChildren(node);+ markdown.append("_");+ }++ }));+ handlers.add(new NodeFormattingHandler<>(StrongEmphasis.class, new CustomNodeFormatter<StrongEmphasis>() {++ @Override+ public void render(@NotNull StrongEmphasis node, @NotNull NodeFormatterContext context,+ @NotNull MarkdownWriter markdown) {+ markdown.append("*");+ context.renderChildren(node);+ markdown.append("*");+ }++ }));+ handlers.add(new NodeFormattingHandler<>(Link.class, new CustomNodeFormatter<Link>() {++ @Override+ public void render(@NotNull Link node, @NotNull NodeFormatterContext context,+ @NotNull MarkdownWriter markdown) {+ renderInlineLink(node, context, markdown);+ }++ }));+ handlers.add(new NodeFormattingHandler<>(Image.class, new CustomNodeFormatter<Image>() {++ @Override+ public void render(@NotNull Image node, @NotNull NodeFormatterContext context,+ @NotNull MarkdownWriter markdown) {+ renderInlineLink(node, context, markdown);+ }++ }));+ return handlers;+ }++ @Override+ public @Nullable Set<Class<?>> getNodeClasses() {+ return null;+ }++ };+ }++ });+ }++ });+ return Formatter.builder().extensions(extensions).build().render(node);+ }++ @Transactional+ @Listen+ public void on(IssueEvent event) {+ if (!(event instanceof IssueChanged)+ || !(((IssueChanged) event).getChange().getData() instanceof ReferencedFromAware)) {+ sessionManager.runAsyncAfterCommit(new Runnable() {++ @Override+ public void run() {+ IssueEvent clone = (IssueEvent) event.cloneIn(dao);++ Issue issue = clone.getIssue();+ User user = clone.getUser();++ String issueInfo = String.format("[Issue] (%s - %s)", issue.getFQN(), issue.getTitle());++ String eventDescription;+ if (user != null)+ eventDescription = user.getDisplayName() + " " + clone.getActivity();+ else+ eventDescription = StringUtils.capitalize(clone.getActivity());++ post(clone, issueInfo + " " + eventDescription, null);+ }++ }, LockUtils.getLock(Issue.getSerialLockName(event.getIssue().getId()), true));+ }++ }++ @Transactional+ @Listen+ public void on(PullRequestEvent event) {+ boolean significantChange = false;+ if (event instanceof PullRequestChanged) {+ PullRequestChangeData changeData = ((PullRequestChanged) event).getChange().getData();+ if (changeData instanceof PullRequestApproveData+ || changeData instanceof PullRequestRequestedForChangesData+ || changeData instanceof PullRequestMergeData+ || changeData instanceof PullRequestDiscardData+ || changeData instanceof PullRequestReopenData) {+ significantChange = true;+ }+ } else if (!(event instanceof PullRequestMergePreviewCalculated+ || event instanceof PullRequestBuildEvent+ || event instanceof PullRequestReviewRequested+ || event instanceof PullRequestReviewerRemoved+ || event instanceof PullRequestAssigned+ || event instanceof PullRequestUnassigned)) {+ significantChange = true;+ }++ if (significantChange) {+ sessionManager.runAsyncAfterCommit(new Runnable() {++ @Override+ public void run() {+ PullRequestEvent clone = (PullRequestEvent) event.cloneIn(dao);++ PullRequest request = clone.getRequest();+ User user = clone.getUser();++ String pullRequestInfo = String.format("[Pull Request] (%s - %s)", request.getFQN(), request.getTitle());++ String eventDescription;+ if (user != null)+ eventDescription = user.getDisplayName() + " " + clone.getActivity();+ else+ eventDescription = StringUtils.capitalize(clone.getActivity());++ post(clone, pullRequestInfo + " " + eventDescription, null);+ }++ }, LockUtils.getLock(PullRequest.getSerialLockName(event.getRequest().getId()), true));+ }++ }++ private void post(ProjectEvent event, String title, @Nullable String body) {+ List<Object> blocks = new ArrayList<>();++ blocks.add(CollectionUtils.newHashMap(+ "type", "section",+ "text", CollectionUtils.newHashMap(+ "type", "plain_text",+ "text", title)));++ if (body != null) {+ blocks.add(CollectionUtils.newHashMap(+ "type", "section",+ "text", CollectionUtils.newHashMap(+ "type", "plain_text",+ "text", body)));+ }++ ActivityDetail activityDetail = event.getActivityDetail();+ if (activityDetail != null) {+ blocks.add(CollectionUtils.newHashMap(+ "type", "section",+ "text", CollectionUtils.newHashMap(+ "type", "plain_text",+ "text", activityDetail.getTextVersion())));+ }++ String markdown = event.getMarkdown();+ if (markdown != null) {+ if (mailManager.isMailContent(markdown)) {+ blocks.add(CollectionUtils.newHashMap(+ "type", "section",+ "text", CollectionUtils.newHashMap(+ "type", "plain_text",+ "text", mailManager.toPlainText(markdown))));+ } else {+ blocks.add(CollectionUtils.newHashMap(+ "type", "section",+ "text", CollectionUtils.newHashMap(+ "type", "mrkdwn",+ "text", toMrkdwn(markdown))));+ }+ }++ blocks.add(CollectionUtils.newHashMap(+ "type", "section",+ "text", CollectionUtils.newHashMap(+ "type", "mrkdwn",+ "text", "<" + event.getUrl() + "|Click here for details>")));++ Map<Object, Object> data = CollectionUtils.newHashMap(+ "text", title,+ "blocks", blocks);++ for (ChannelNotification notification: getNotifications(event.getProject())) {+ if (notification.matches(event)) {+ try (CloseableHttpClient client = HttpClients.createDefault()) {+ HttpPost post = new HttpPost(notification.getWebhookUrl());++ StringEntity entity = new StringEntity(objectMapper.writeValueAsString(data), ContentType.APPLICATION_JSON);+ post.setEntity(entity);++ try (CloseableHttpResponse response = client.execute(post)) {+ if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {+ String content = IOUtils.readInputStreamToString(response.getEntity().getContent());+ String errorMessage = String.format("Error sending slack notification (status code: %d, response: %s)",+ response.getStatusLine().getStatusCode(), content);+ logger.error(errorMessage);+ }+ }+ } catch (Exception e) {+ logger.error("Error sending slack notification", e);+ }+ }+ }++ }++ @Transactional+ @Listen+ public void on(BuildEvent event) {+ sessionManager.runAsyncAfterCommit(new Runnable() {++ @Override+ public void run() {+ BuildEvent clone = (BuildEvent) event.cloneIn(dao);++ Build build = clone.getBuild();++ String eventDescription = build.getStatus().toString();+ if (build.getVersion() != null)+ eventDescription = build.getVersion() + " " + eventDescription;++ String buildInfo = String.format("[Build] (%s - %s)", build.getFQN(), build.getJobName());+ post(clone, buildInfo + " " + eventDescription, null);+ }++ }, LockUtils.getLock(Build.getSerialLockName(event.getBuild().getId()), true));+ }++ @Sessional+ @Listen+ public void on(RefUpdated event) {+ if (!event.getNewCommitId().equals(ObjectId.zeroId())) {+ Project project = event.getProject();+ RevCommit commit = project.getRevCommit(event.getNewCommitId(), false);+ if (commit != null) {+ String target = GitUtils.ref2branch(event.getRefName());+ if (target == null) {+ target = GitUtils.ref2tag(event.getRefName());+ if (target == null)+ target = event.getRefName();+ }++ String commitInfo = String.format("[Commit] (%s:%s - %s)",+ project.getPath(), GitUtils.abbreviateSHA(commit.name()), target);+ post(event, commitInfo + " " + commit.getShortMessage(), GitUtils.getDetailMessage(commit));+ }+ }+ }++ @Transactional+ @Listen+ public void on(CodeCommentEvent event) {+ if (!(event instanceof CodeCommentUpdated)) {+ sessionManager.runAsyncAfterCommit(new Runnable() {++ @Override+ public void run() {+ CodeCommentEvent clone = (CodeCommentEvent) event.cloneIn(dao);++ CodeComment comment = clone.getComment();++ String commentInfo = String.format("[Code Comment] (%s:%s)",+ clone.getProject().getPath(), comment.getMark().getPath());++ String eventDescription = String.format("%s %s",+ clone.getUser().getDisplayName(), clone.getActivity());++ post(clone, commentInfo + " " + eventDescription, null);+ }++ });+ }+ }++}diff --git a/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationSetting.java b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationSetting.javanew file mode 100644index 0000000000..58548ab90f--- /dev/null+++ b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationSetting.java@@ -0,0 +1,51 @@+package io.onedev.server.plugin.notification.slack;++import java.util.ArrayList;+import java.util.HashSet;+import java.util.List;+import java.util.Set;++import javax.validation.ConstraintValidatorContext;+import javax.validation.constraints.NotNull;++import io.onedev.server.util.validation.Validatable;+import io.onedev.server.util.validation.annotation.ClassValidating;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.page.project.setting.ContributedProjectSetting;++@Editable(name="Slack Notifications", description="Set up slack notification settings. Settings will be inherited by "+ + "child projects, and can be overriden by defining setting with same webhook url")+@ClassValidating+public class SlackNotificationSetting implements ContributedProjectSetting, Validatable {++ private static final long serialVersionUID = 1L;++ private List<ChannelNotificationWrapper> notifications = new ArrayList<>();++ @Editable+ @OmitName+ @NotNull+ public List<ChannelNotificationWrapper> getNotifications() {+ return notifications;+ }++ public void setNotifications(List<ChannelNotificationWrapper> notifications) {+ this.notifications = notifications;+ }++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ Set<String> webhookUrls = new HashSet<>();+ for (ChannelNotificationWrapper notification: notifications) {+ if (notification.getChannelNotification().getWebhookUrl() != null+ && !webhookUrls.add(notification.getChannelNotification().getWebhookUrl())) {+ context.disableDefaultConstraintViolation();+ context.buildConstraintViolationWithTemplate("Duplicate webhook url found").addConstraintViolation();+ return false;+ }+ }+ return true;+ }++}diff --git a/server-product/pom.xml b/server-product/pom.xmlindex ebe49b57ce..ba9682bcc2 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -150,6 +150,11 @@<artifactId>server-plugin-sso-discord</artifactId><version>${project.version}</version></dependency>+ <dependency>+ <groupId>io.onedev</groupId>+ <artifactId>server-plugin-notification-slack</artifactId>+ <version>${project.version}</version>+ </dependency><!-- Add explicit dependencies to make sure standalone plugins use expected lib version --><dependency>