Skip to content

The Unified and Autonomous Development Platform

Add web hooks

Robin Shenb15993f18f86
diff --git a/core/pom.xml b/core/pom.xml
index adf5874c3c..bd264f13a5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -105,6 +105,10 @@
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-bean-validation</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.ext</groupId>
+ <artifactId>jersey-bean-validation</artifactId>
+ </dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>guice-bridge</artifactId>
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java
index eec05e8c15..86dad5c78f 100644
--- a/core/src/main/java/io/onedev/server/CoreModule.java
+++ b/core/src/main/java/io/onedev/server/CoreModule.java
@@ -167,6 +167,7 @@ import io.onedev.server.manager.impl.DefaultSettingManager;
import io.onedev.server.manager.impl.DefaultStorageManager;
import io.onedev.server.manager.impl.DefaultUserInfoManager;
import io.onedev.server.manager.impl.DefaultUserManager;
+import io.onedev.server.manager.impl.DefaultWebHookManager;
import io.onedev.server.manager.impl.DefaultWorkExecutor;
import io.onedev.server.migration.JpaConverter;
import io.onedev.server.migration.PersistentBagConverter;
@@ -338,6 +339,7 @@ public class CoreModule extends AbstractPluginModule {
bind(CodeCommentQuerySettingManager.class).to(DefaultCodeCommentQuerySettingManager.class);
bind(CommitQuerySettingManager.class).to(DefaultCommitQuerySettingManager.class);
bind(BuildQuerySettingManager.class).to(DefaultBuildQuerySettingManager.class);
+ bind(DefaultWebHookManager.class);
contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);
contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);
diff --git a/core/src/main/java/io/onedev/server/OneDev.java b/core/src/main/java/io/onedev/server/OneDev.java
index 31b6f79900..06a6613263 100644
--- a/core/src/main/java/io/onedev/server/OneDev.java
+++ b/core/src/main/java/io/onedev/server/OneDev.java
@@ -22,11 +22,11 @@ import io.onedev.launcher.loader.AbstractPlugin;
import io.onedev.launcher.loader.AppLoader;
import io.onedev.launcher.loader.ListenerRegistry;
import io.onedev.launcher.loader.ManagedSerializedForm;
-import io.onedev.server.event.lifecycle.SystemStarted;
-import io.onedev.server.event.lifecycle.SystemStarting;
-import io.onedev.server.event.lifecycle.SystemStopped;
-import io.onedev.server.event.lifecycle.SystemStopping;
import io.onedev.server.manager.SettingManager;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.event.system.SystemStarting;
+import io.onedev.server.event.system.SystemStopped;
+import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.manager.DataManager;
import io.onedev.server.manager.UserManager;
import io.onedev.server.persistence.PersistManager;
diff --git a/core/src/main/java/io/onedev/server/event/Event.java b/core/src/main/java/io/onedev/server/event/Event.java
new file mode 100644
index 0000000000..a76f640058
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/Event.java
@@ -0,0 +1,33 @@
+package io.onedev.server.event;
+
+import java.util.Date;
+
+import javax.annotation.Nullable;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+
+import io.onedev.server.model.User;
+
+@JsonTypeInfo(property="@class", use = Id.CLASS)
+public abstract class Event {
+
+ private final User user;
+
+ private final Date date;
+
+ public Event(@Nullable User user, Date date) {
+ this.user = user;
+ this.date = date;
+ }
+
+ @Nullable
+ public User getUser() {
+ return user;
+ }
+
+ public Date getDate() {
+ return date;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/ProjectEvent.java b/core/src/main/java/io/onedev/server/event/ProjectEvent.java
new file mode 100644
index 0000000000..2a3f9c2f9d
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/ProjectEvent.java
@@ -0,0 +1,21 @@
+package io.onedev.server.event;
+
+import java.util.Date;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+
+public abstract class ProjectEvent extends Event {
+
+ private final Project project;
+
+ public ProjectEvent(User user, Date date, Project project) {
+ super(user, date);
+ this.project = project;
+ }
+
+ public Project getProject() {
+ return project;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/ProjectRenamed.java b/core/src/main/java/io/onedev/server/event/ProjectRenamed.java
deleted file mode 100644
index 91d99b39f0..0000000000
--- a/core/src/main/java/io/onedev/server/event/ProjectRenamed.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.onedev.server.event;
-
-import io.onedev.server.model.Project;
-
-public class ProjectRenamed {
-
- private final Project project;
-
- private final String oldName;
-
- public ProjectRenamed(Project project, String oldName) {
- this.project = project;
- this.oldName = oldName;
- }
-
- public Project getProject() {
- return project;
- }
-
- public String getOldName() {
- return oldName;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/event/RefUpdated.java b/core/src/main/java/io/onedev/server/event/RefUpdated.java
index 0d09369d4c..a98892b241 100644
--- a/core/src/main/java/io/onedev/server/event/RefUpdated.java
+++ b/core/src/main/java/io/onedev/server/event/RefUpdated.java
@@ -4,9 +4,7 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.model.Project;
-public class RefUpdated {
-
- private final Project project;
+public class RefUpdated extends ProjectEvent {
private final String refName;
@@ -15,16 +13,12 @@ public class RefUpdated {
private final ObjectId newCommitId;
public RefUpdated(Project project, String refName, ObjectId oldCommitId, ObjectId newCommitId) {
- this.project = project;
+ super(null, null, project);
this.refName = refName;
this.oldCommitId = oldCommitId;
this.newCommitId = newCommitId;
}
- public Project getProject() {
- return project;
- }
-
public String getRefName() {
return refName;
}
diff --git a/core/src/main/java/io/onedev/server/event/build/BuildEvent.java b/core/src/main/java/io/onedev/server/event/build/BuildEvent.java
index d8deea24d4..029f3a30e2 100644
--- a/core/src/main/java/io/onedev/server/event/build/BuildEvent.java
+++ b/core/src/main/java/io/onedev/server/event/build/BuildEvent.java
@@ -1,12 +1,14 @@
package io.onedev.server.event.build;
+import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.Build;
-public abstract class BuildEvent {
+public abstract class BuildEvent extends ProjectEvent {
private final Build build;
public BuildEvent(Build build) {
+ super(null, build.getDate(), build.getConfiguration().getProject());
this.build = build;
}
diff --git a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentAdded.java b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentAdded.java
index ed99450bcb..a94964db1a 100644
--- a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentAdded.java
+++ b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentAdded.java
@@ -1,17 +1,14 @@
package io.onedev.server.event.codecomment;
-import java.util.Date;
-
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(name="created")
public class CodeCommentAdded extends CodeCommentEvent {
public CodeCommentAdded(CodeComment comment, PullRequest request) {
- super(comment, request);
+ super(comment.getUser(), comment.getDate(), comment, request);
}
@Override
@@ -19,14 +16,4 @@ public class CodeCommentAdded extends CodeCommentEvent {
return getComment().getContent();
}
- @Override
- public User getUser() {
- return getComment().getUser();
- }
-
- @Override
- public Date getDate() {
- return getComment().getDate();
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java
index d73a1059bb..36b2057b31 100644
--- a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java
+++ b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java
@@ -5,11 +5,12 @@ import java.util.Date;
import javax.annotation.Nullable;
import io.onedev.server.event.MarkdownAware;
+import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-public abstract class CodeCommentEvent implements MarkdownAware {
+public abstract class CodeCommentEvent extends ProjectEvent implements MarkdownAware {
private final CodeComment comment;
@@ -22,7 +23,8 @@ public abstract class CodeCommentEvent implements MarkdownAware {
* @param request
* pull request context when this event is created
*/
- public CodeCommentEvent(CodeComment comment, @Nullable PullRequest request) {
+ public CodeCommentEvent(User user, Date date, CodeComment comment, @Nullable PullRequest request) {
+ super(user, date, comment.getProject());
this.comment = comment;
this.request = request;
}
@@ -36,8 +38,4 @@ public abstract class CodeCommentEvent implements MarkdownAware {
return request;
}
- public abstract User getUser();
-
- public abstract Date getDate();
-
}
diff --git a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
index 9995b3ceed..7d5100fa01 100644
--- a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
+++ b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
@@ -1,10 +1,7 @@
package io.onedev.server.event.codecomment;
-import java.util.Date;
-
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(name="replied")
@@ -13,7 +10,7 @@ public class CodeCommentReplied extends CodeCommentEvent {
private final CodeCommentReply reply;
public CodeCommentReplied(CodeCommentReply reply, PullRequest request) {
- super(reply.getComment(), request);
+ super(reply.getUser(), reply.getDate(), reply.getComment(), request);
this.reply = reply;
}
@@ -26,14 +23,4 @@ public class CodeCommentReplied extends CodeCommentEvent {
return reply.getContent();
}
- @Override
- public User getUser() {
- return reply.getUser();
- }
-
- @Override
- public Date getDate() {
- return reply.getDate();
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/event/entity/EntityEvent.java b/core/src/main/java/io/onedev/server/event/entity/EntityEvent.java
new file mode 100644
index 0000000000..1b55b9a0a8
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/entity/EntityEvent.java
@@ -0,0 +1,21 @@
+package io.onedev.server.event.entity;
+
+import java.util.Date;
+
+import io.onedev.server.event.Event;
+import io.onedev.server.model.AbstractEntity;
+
+public abstract class EntityEvent extends Event {
+
+ private final AbstractEntity entity;
+
+ public EntityEvent(AbstractEntity entity) {
+ super(null, new Date());
+ this.entity = entity;
+ }
+
+ public AbstractEntity getEntity() {
+ return entity;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/persistence/dao/EntityPersisted.java b/core/src/main/java/io/onedev/server/event/entity/EntityPersisted.java
similarity index 53%
rename from core/src/main/java/io/onedev/server/persistence/dao/EntityPersisted.java
rename to core/src/main/java/io/onedev/server/event/entity/EntityPersisted.java
index 80b585a881..76cbb2c4a5 100644
--- a/core/src/main/java/io/onedev/server/persistence/dao/EntityPersisted.java
+++ b/core/src/main/java/io/onedev/server/event/entity/EntityPersisted.java
@@ -1,22 +1,16 @@
-package io.onedev.server.persistence.dao;
+package io.onedev.server.event.entity;
import io.onedev.server.model.AbstractEntity;
-public class EntityPersisted {
-
- private final AbstractEntity entity;
+public class EntityPersisted extends EntityEvent {
private final boolean isNew;
public EntityPersisted(AbstractEntity entity, boolean isNew) {
- this.entity = entity;
+ super(entity);
this.isNew = isNew;
}
- public AbstractEntity getEntity() {
- return entity;
- }
-
public boolean isNew() {
return isNew;
}
diff --git a/core/src/main/java/io/onedev/server/event/entity/EntityRemoved.java b/core/src/main/java/io/onedev/server/event/entity/EntityRemoved.java
new file mode 100644
index 0000000000..35cb9395e8
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/entity/EntityRemoved.java
@@ -0,0 +1,11 @@
+package io.onedev.server.event.entity;
+
+import io.onedev.server.model.AbstractEntity;
+
+public class EntityRemoved extends EntityEvent {
+
+ public EntityRemoved(AbstractEntity entity) {
+ super(entity);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/issue/IssueActionEvent.java b/core/src/main/java/io/onedev/server/event/issue/IssueActionEvent.java
index 5da253f584..2e0e5ef69f 100644
--- a/core/src/main/java/io/onedev/server/event/issue/IssueActionEvent.java
+++ b/core/src/main/java/io/onedev/server/event/issue/IssueActionEvent.java
@@ -1,17 +1,14 @@
package io.onedev.server.event.issue;
-import java.util.Date;
-
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.IssueAction;
-import io.onedev.server.model.User;
public class IssueActionEvent extends IssueEvent implements MarkdownAware {
private final IssueAction action;
public IssueActionEvent(IssueAction action) {
- super(action.getIssue());
+ super(action.getUser(), action.getDate(), action.getIssue());
this.action = action;
}
@@ -19,16 +16,6 @@ public class IssueActionEvent extends IssueEvent implements MarkdownAware {
return action;
}
- @Override
- public User getUser() {
- return User.getForDisplay(getAction().getUser(), getAction().getUserName());
- }
-
- @Override
- public Date getDate() {
- return action.getDate();
- }
-
@Override
public String getMarkdown() {
if (action.getData().getCommentSupport() != null)
diff --git a/core/src/main/java/io/onedev/server/event/issue/IssueCommented.java b/core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
index 9e50f80924..b9bc335e9c 100644
--- a/core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
+++ b/core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
@@ -1,17 +1,14 @@
package io.onedev.server.event.issue;
-import java.util.Date;
-
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.IssueComment;
-import io.onedev.server.model.User;
public class IssueCommented extends IssueEvent implements MarkdownAware {
private final IssueComment comment;
public IssueCommented(IssueComment comment) {
- super(comment.getIssue());
+ super(comment.getUser(), comment.getDate(), comment.getIssue());
this.comment = comment;
}
@@ -24,14 +21,4 @@ public class IssueCommented extends IssueEvent implements MarkdownAware {
return getComment().getContent();
}
- @Override
- public User getUser() {
- return User.getForDisplay(comment.getUser(), comment.getUserName());
- }
-
- @Override
- public Date getDate() {
- return comment.getDate();
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/event/issue/IssueEvent.java b/core/src/main/java/io/onedev/server/event/issue/IssueEvent.java
index ef401c7395..ec47b95fb1 100644
--- a/core/src/main/java/io/onedev/server/event/issue/IssueEvent.java
+++ b/core/src/main/java/io/onedev/server/event/issue/IssueEvent.java
@@ -2,23 +2,20 @@ package io.onedev.server.event.issue;
import java.util.Date;
+import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
-public abstract class IssueEvent {
+public abstract class IssueEvent extends ProjectEvent {
private final Issue issue;
- public IssueEvent(Issue issue) {
+ public IssueEvent(User user, Date date, Issue issue) {
+ super(user, date, issue.getProject());
this.issue = issue;
}
public Issue getIssue() {
return issue;
}
-
- public abstract User getUser();
-
- public abstract Date getDate();
-
}
diff --git a/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java b/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
index 46ba75f406..19a5dee389 100644
--- a/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
+++ b/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
@@ -1,15 +1,12 @@
package io.onedev.server.event.issue;
-import java.util.Date;
-
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.User;
public class IssueOpened extends IssueEvent implements MarkdownAware {
public IssueOpened(Issue issue) {
- super(issue);
+ super(issue.getSubmitter(), issue.getSubmitDate(), issue);
}
@Override
@@ -17,14 +14,4 @@ public class IssueOpened extends IssueEvent implements MarkdownAware {
return getIssue().getDescription();
}
- @Override
- public User getUser() {
- return User.getForDisplay(getIssue().getSubmitter(), getIssue().getSubmitterName());
- }
-
- @Override
- public Date getDate() {
- return getIssue().getSubmitDate();
- }
-
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/event/lifecycle/SystemStarted.java b/core/src/main/java/io/onedev/server/event/lifecycle/SystemStarted.java
deleted file mode 100644
index 0f551a629e..0000000000
--- a/core/src/main/java/io/onedev/server/event/lifecycle/SystemStarted.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.onedev.server.event.lifecycle;
-
-public class SystemStarted {
-
-}
diff --git a/core/src/main/java/io/onedev/server/event/lifecycle/SystemStarting.java b/core/src/main/java/io/onedev/server/event/lifecycle/SystemStarting.java
deleted file mode 100644
index 6a2e29b7b8..0000000000
--- a/core/src/main/java/io/onedev/server/event/lifecycle/SystemStarting.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.onedev.server.event.lifecycle;
-
-public class SystemStarting {
-
-}
diff --git a/core/src/main/java/io/onedev/server/event/lifecycle/SystemStopped.java b/core/src/main/java/io/onedev/server/event/lifecycle/SystemStopped.java
deleted file mode 100644
index 81d2e1afc7..0000000000
--- a/core/src/main/java/io/onedev/server/event/lifecycle/SystemStopped.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.onedev.server.event.lifecycle;
-
-public class SystemStopped {
-
-}
diff --git a/core/src/main/java/io/onedev/server/event/lifecycle/SystemStopping.java b/core/src/main/java/io/onedev/server/event/lifecycle/SystemStopping.java
deleted file mode 100644
index 39e48e6403..0000000000
--- a/core/src/main/java/io/onedev/server/event/lifecycle/SystemStopping.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.onedev.server.event.lifecycle;
-
-public class SystemStopping {
-
-}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestActionEvent.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestActionEvent.java
index 767a0a7f7b..75cf6d6c85 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestActionEvent.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestActionEvent.java
@@ -1,17 +1,14 @@
package io.onedev.server.event.pullrequest;
-import java.util.Date;
-
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.PullRequestAction;
-import io.onedev.server.model.User;
public class PullRequestActionEvent extends PullRequestEvent implements MarkdownAware {
private final PullRequestAction action;
public PullRequestActionEvent(PullRequestAction action) {
- super(action.getRequest());
+ super(action.getUser(), action.getDate(), action.getRequest());
this.action = action;
}
@@ -19,16 +16,6 @@ public class PullRequestActionEvent extends PullRequestEvent implements Markdown
return action;
}
- @Override
- public User getUser() {
- return action.getUser();
- }
-
- @Override
- public Date getDate() {
- return action.getDate();
- }
-
@Override
public String getMarkdown() {
if (action.getData().getCommentSupport() != null)
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java
index 67d7a6db9d..8305ee136a 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java
@@ -4,32 +4,18 @@ import java.util.Date;
import io.onedev.server.model.Build;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
public class PullRequestBuildEvent extends PullRequestEvent {
private final Build build;
- private final Date date;
-
public PullRequestBuildEvent(PullRequest request, Build build) {
- super(request);
+ super(null, new Date(), request);
this.build = build;
- date = new Date();
}
public Build getBuild() {
return build;
}
- @Override
- public User getUser() {
- return null;
- }
-
- @Override
- public Date getDate() {
- return date;
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentAdded.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentAdded.java
index 6c2642de70..f58665c2dc 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentAdded.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentAdded.java
@@ -1,16 +1,13 @@
package io.onedev.server.event.pullrequest;
-import java.util.Date;
-
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
public class PullRequestCodeCommentAdded extends PullRequestCodeCommentEvent implements MarkdownAware {
public PullRequestCodeCommentAdded(PullRequest request, CodeComment comment, boolean derived) {
- super(request, comment, derived);
+ super(comment.getUser(), comment.getDate(), request, comment, derived);
}
@Override
@@ -18,14 +15,4 @@ public class PullRequestCodeCommentAdded extends PullRequestCodeCommentEvent imp
return getComment().getContent();
}
- @Override
- public User getUser() {
- return getComment().getUser();
- }
-
- @Override
- public Date getDate() {
- return getComment().getDate();
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentEvent.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentEvent.java
index 942dd2d44b..79cecd0d20 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentEvent.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentEvent.java
@@ -1,8 +1,11 @@
package io.onedev.server.event.pullrequest;
+import java.util.Date;
+
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
public abstract class PullRequestCodeCommentEvent extends PullRequestEvent implements MarkdownAware {
@@ -10,8 +13,8 @@ public abstract class PullRequestCodeCommentEvent extends PullRequestEvent imple
private final boolean derived;
- public PullRequestCodeCommentEvent(PullRequest request, CodeComment comment, boolean derived) {
- super(request);
+ public PullRequestCodeCommentEvent(User user, Date date, PullRequest request, CodeComment comment, boolean derived) {
+ super(user, date, request);
this.comment = comment;
this.derived = derived;
}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java
index e19ad145a8..022f8c565c 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java
@@ -1,17 +1,14 @@
package io.onedev.server.event.pullrequest;
-import java.util.Date;
-
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
public class PullRequestCodeCommentReplied extends PullRequestCodeCommentEvent {
private final CodeCommentReply reply;
public PullRequestCodeCommentReplied(PullRequest request, CodeCommentReply reply, boolean derived) {
- super(request, reply.getComment(), derived);
+ super(reply.getUser(), reply.getDate(), request, reply.getComment(), derived);
this.reply = reply;
}
@@ -24,14 +21,4 @@ public class PullRequestCodeCommentReplied extends PullRequestCodeCommentEvent {
return reply.getContent();
}
- @Override
- public User getUser() {
- return reply.getUser();
- }
-
- @Override
- public Date getDate() {
- return reply.getDate();
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentAdded.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentAdded.java
index 277a637218..a07bbd625f 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentAdded.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentAdded.java
@@ -1,17 +1,14 @@
package io.onedev.server.event.pullrequest;
-import java.util.Date;
-
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.model.User;
public class PullRequestCommentAdded extends PullRequestEvent implements MarkdownAware {
private final PullRequestComment comment;
public PullRequestCommentAdded(PullRequestComment comment) {
- super(comment.getRequest());
+ super(comment.getUser(), comment.getDate(), comment.getRequest());
this.comment = comment;
}
@@ -24,14 +21,4 @@ public class PullRequestCommentAdded extends PullRequestEvent implements Markdow
return getComment().getContent();
}
- @Override
- public User getUser() {
- return comment.getUser();
- }
-
- @Override
- public Date getDate() {
- return comment.getDate();
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java
index 133db7d32d..588c941c2f 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java
@@ -2,16 +2,16 @@ package io.onedev.server.event.pullrequest;
import java.util.Date;
-import javax.annotation.Nullable;
-
+import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-public abstract class PullRequestEvent {
+public abstract class PullRequestEvent extends ProjectEvent {
private final PullRequest request;
- public PullRequestEvent(PullRequest request) {
+ public PullRequestEvent(User user, Date date, PullRequest request) {
+ super(user, date, request.getTargetProject());
this.request = request;
}
@@ -19,9 +19,4 @@ public abstract class PullRequestEvent {
return request;
}
- @Nullable
- public abstract User getUser();
-
- public abstract Date getDate();
-
}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
index 3e9bc37168..ddb5ae2cb3 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
@@ -3,25 +3,11 @@ package io.onedev.server.event.pullrequest;
import java.util.Date;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
public class PullRequestMergePreviewCalculated extends PullRequestEvent {
- private final Date date;
-
public PullRequestMergePreviewCalculated(PullRequest request) {
- super(request);
- date = new Date();
- }
-
- @Override
- public User getUser() {
- return null;
- }
-
- @Override
- public Date getDate() {
- return date;
+ super(null, new Date(), request);
}
}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
index 16834215d0..941ecef3b9 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
@@ -1,15 +1,12 @@
package io.onedev.server.event.pullrequest;
-import java.util.Date;
-
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
public class PullRequestOpened extends PullRequestEvent implements MarkdownAware {
public PullRequestOpened(PullRequest request) {
- super(request);
+ super(request.getSubmitter(), request.getSubmitDate(), request);
}
@Override
@@ -17,14 +14,4 @@ public class PullRequestOpened extends PullRequestEvent implements MarkdownAware
return getRequest().getDescription();
}
- @Override
- public User getUser() {
- return User.getForDisplay(getRequest().getSubmitter(), getRequest().getSubmitterName());
- }
-
- @Override
- public Date getDate() {
- return getRequest().getSubmitDate();
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java
index 100be96f7e..f7ae52d433 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java
@@ -1,16 +1,13 @@
package io.onedev.server.event.pullrequest;
-import java.util.Date;
-
import io.onedev.server.model.PullRequestUpdate;
-import io.onedev.server.model.User;
public class PullRequestUpdated extends PullRequestEvent {
private final PullRequestUpdate update;
public PullRequestUpdated(PullRequestUpdate update) {
- super(update.getRequest());
+ super(null, update.getDate(), update.getRequest());
this.update = update;
}
@@ -18,14 +15,4 @@ public class PullRequestUpdated extends PullRequestEvent {
return update;
}
- @Override
- public User getUser() {
- return null;
- }
-
- @Override
- public Date getDate() {
- return update.getDate();
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/event/system/SystemStarted.java b/core/src/main/java/io/onedev/server/event/system/SystemStarted.java
new file mode 100644
index 0000000000..04b2748067
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/system/SystemStarted.java
@@ -0,0 +1,13 @@
+package io.onedev.server.event.system;
+
+import java.util.Date;
+
+import io.onedev.server.event.Event;
+
+public class SystemStarted extends Event {
+
+ public SystemStarted() {
+ super(null, new Date());
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/system/SystemStarting.java b/core/src/main/java/io/onedev/server/event/system/SystemStarting.java
new file mode 100644
index 0000000000..f78e71f9f8
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/system/SystemStarting.java
@@ -0,0 +1,13 @@
+package io.onedev.server.event.system;
+
+import java.util.Date;
+
+import io.onedev.server.event.Event;
+
+public class SystemStarting extends Event {
+
+ public SystemStarting() {
+ super(null, new Date());
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/system/SystemStopped.java b/core/src/main/java/io/onedev/server/event/system/SystemStopped.java
new file mode 100644
index 0000000000..9d2e882f63
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/system/SystemStopped.java
@@ -0,0 +1,13 @@
+package io.onedev.server.event.system;
+
+import java.util.Date;
+
+import io.onedev.server.event.Event;
+
+public class SystemStopped extends Event {
+
+ public SystemStopped() {
+ super(null, new Date());
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/system/SystemStopping.java b/core/src/main/java/io/onedev/server/event/system/SystemStopping.java
new file mode 100644
index 0000000000..709598901e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/system/SystemStopping.java
@@ -0,0 +1,13 @@
+package io.onedev.server.event.system;
+
+import java.util.Date;
+
+import io.onedev.server.event.Event;
+
+public class SystemStopping extends Event {
+
+ public SystemStopping() {
+ super(null, new Date());
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java b/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java
index b7bdba74ce..a9f9098c7d 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java
@@ -14,7 +14,7 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.launcher.loader.Listen;
-import io.onedev.server.event.lifecycle.SystemStopping;
+import io.onedev.server.event.system.SystemStopping;
import io.onedev.utils.FileUtils;
import com.google.common.base.Charsets;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.java
index 8c528141df..e42481848e 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.java
@@ -12,8 +12,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.onedev.launcher.loader.Listen;
-import io.onedev.server.event.lifecycle.SystemStarted;
-import io.onedev.server.event.lifecycle.SystemStopping;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.manager.AttachmentManager;
import io.onedev.server.manager.StorageManager;
import io.onedev.server.model.CodeComment;
@@ -22,8 +24,6 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityPersisted;
-import io.onedev.server.persistence.dao.EntityRemoved;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.utils.FileUtils;
import io.onedev.utils.schedule.SchedulableTask;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.java
index 7816d23d63..84daf3b005 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.java
@@ -16,8 +16,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.onedev.launcher.loader.Listen;
-import io.onedev.server.event.lifecycle.SystemStarted;
-import io.onedev.server.event.lifecycle.SystemStopping;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.manager.BatchWorkManager;
import io.onedev.server.manager.WorkExecutor;
import io.onedev.server.util.BatchWorker;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.java
index 53f2979946..a37c43dd1d 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.java
@@ -14,7 +14,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.onedev.launcher.loader.Listen;
-import io.onedev.server.event.lifecycle.SystemStarted;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.git.GitUtils;
import io.onedev.server.manager.BatchWorkManager;
import io.onedev.server.manager.BuildInfoManager;
@@ -27,8 +29,6 @@ import io.onedev.server.persistence.UnitOfWork;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityPersisted;
-import io.onedev.server.persistence.dao.EntityRemoved;
import io.onedev.server.util.BatchWorker;
import io.onedev.utils.FileUtils;
import io.onedev.utils.concurrent.Prioritized;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
index 8962c10825..50cee75fc3 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
@@ -27,8 +27,8 @@ import io.onedev.launcher.loader.ListenerRegistry;
import io.onedev.server.OneDev;
import io.onedev.server.event.build.BuildFinished;
import io.onedev.server.event.build.BuildStarted;
-import io.onedev.server.event.lifecycle.SystemStarted;
-import io.onedev.server.event.lifecycle.SystemStopping;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.manager.BuildManager;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.ConfigurationManager;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java
index 9b76e853df..7c3fdfed54 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java
@@ -20,7 +20,9 @@ import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import io.onedev.launcher.loader.Listen;
-import io.onedev.server.event.lifecycle.SystemStarted;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Configuration;
@@ -32,8 +34,6 @@ import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityPersisted;
-import io.onedev.server.persistence.dao.EntityRemoved;
import io.onedev.server.util.facade.BuildFacade;
import io.onedev.server.util.facade.ConfigurationFacade;
import io.onedev.server.util.facade.EntityFacade;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java
index ab59b80cdb..aed9f58237 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java
@@ -19,7 +19,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.onedev.launcher.loader.Listen;
-import io.onedev.server.event.lifecycle.SystemStarted;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.manager.BatchWorkManager;
import io.onedev.server.manager.CodeCommentManager;
import io.onedev.server.manager.CodeCommentRelationInfoManager;
@@ -38,8 +40,6 @@ import io.onedev.server.persistence.UnitOfWork;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityPersisted;
-import io.onedev.server.persistence.dao.EntityRemoved;
import io.onedev.server.util.BatchWorker;
import io.onedev.utils.FileUtils;
import io.onedev.utils.concurrent.Prioritized;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java
index c1190ab93c..84db3e6700 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java
@@ -42,7 +42,8 @@ import com.google.common.base.Throwables;
import io.onedev.launcher.loader.Listen;
import io.onedev.server.event.RefUpdated;
-import io.onedev.server.event.lifecycle.SystemStarted;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.git.Contribution;
import io.onedev.server.git.Contributor;
import io.onedev.server.git.GitUtils;
@@ -60,7 +61,6 @@ import io.onedev.server.manager.StorageManager;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.UnitOfWork;
import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.dao.EntityRemoved;
import io.onedev.server.util.BatchWorker;
import io.onedev.server.util.Day;
import io.onedev.server.util.IssueUtils;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java
index cd3acc8de6..e198a0f6f5 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java
@@ -25,7 +25,7 @@ import io.onedev.launcher.bootstrap.Bootstrap;
import io.onedev.launcher.loader.Listen;
import io.onedev.launcher.loader.ManagedSerializedForm;
import io.onedev.server.OneDev;
-import io.onedev.server.event.lifecycle.SystemStarting;
+import io.onedev.server.event.system.SystemStarting;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.DataManager;
import io.onedev.server.manager.MailManager;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java
index 804893f099..f6eb51884c 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java
@@ -13,6 +13,7 @@ import org.hibernate.query.Query;
import com.google.common.base.Preconditions;
import io.onedev.launcher.loader.Listen;
+import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.issue.IssueActionEvent;
import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.manager.MilestoneManager;
@@ -28,7 +29,6 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.persistence.dao.EntityRemoved;
import io.onedev.utils.StringUtils;
@Singleton
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java
index e18552cb3a..a74c4db7fc 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java
@@ -30,11 +30,9 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import io.onedev.launcher.loader.Listen;
-import io.onedev.launcher.loader.ListenerRegistry;
-import io.onedev.server.event.ProjectRenamed;
import io.onedev.server.event.RefUpdated;
-import io.onedev.server.event.lifecycle.SystemStarted;
-import io.onedev.server.event.lifecycle.SystemStopping;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.CloneCommand;
import io.onedev.server.git.command.ListChangedFilesCommand;
@@ -69,8 +67,6 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
private static final Logger logger = LoggerFactory.getLogger(DefaultProjectManager.class);
- private final ListenerRegistry listenerRegistry;
-
private final CommitInfoManager commitInfoManager;
private final TeamManager teamManager;
@@ -86,13 +82,12 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();
@Inject
- public DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager, ListenerRegistry listenerRegistry,
+ public DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager,
TeamManager teamManager, MembershipManager membershipManager, BuildManager buildManager,
CacheManager cacheManager) {
super(dao);
this.commitInfoManager = commitInfoManager;
- this.listenerRegistry = listenerRegistry;
this.teamManager = teamManager;
this.membershipManager = membershipManager;
this.buildManager = buildManager;
@@ -152,9 +147,6 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
membershipManager.save(membership);
}
- if (oldName != null && !project.getName().equals(oldName))
- listenerRegistry.post(new ProjectRenamed(project, oldName));
-
File gitDir = project.getGitDir();
dao.doAfterCommit(new Runnable() {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
index 810676521f..79bf119eb6 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
@@ -59,6 +59,7 @@ import io.onedev.launcher.loader.ListenerRegistry;
import io.onedev.server.OneDev;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.build.BuildEvent;
+import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.pullrequest.PullRequestActionEvent;
import io.onedev.server.event.pullrequest.PullRequestBuildEvent;
import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;
@@ -111,7 +112,6 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.persistence.dao.EntityRemoved;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.java
index c1373d7cce..5c128f3d07 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.java
@@ -10,14 +10,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.onedev.launcher.loader.Listen;
-import io.onedev.server.event.lifecycle.SystemStarting;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.system.SystemStarting;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.StorageManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityRemoved;
import io.onedev.utils.FileUtils;
@Singleton
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java
index 893ba955f7..e33a6f8afd 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java
@@ -12,6 +12,7 @@ import com.google.common.collect.Lists;
import io.onedev.launcher.loader.Listen;
import io.onedev.server.event.codecomment.CodeCommentEvent;
+import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.event.pullrequest.PullRequestActionEvent;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;
@@ -25,7 +26,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.EntityRemoved;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserFacade;
import jetbrains.exodus.env.Environment;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
index d2df9071d2..1c828934f9 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
@@ -12,7 +12,8 @@ import org.hibernate.query.Query;
import io.onedev.launcher.loader.Listen;
import io.onedev.launcher.loader.ListenerRegistry;
-import io.onedev.server.event.lifecycle.SystemStarted;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.IssueFieldUnaryManager;
import io.onedev.server.manager.ProjectManager;
@@ -25,7 +26,6 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityPersisted;
import io.onedev.utils.StringUtils;
@Singleton
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultWebHookManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultWebHookManager.java
new file mode 100644
index 0000000000..e8b7be8237
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultWebHookManager.java
@@ -0,0 +1,104 @@
+package io.onedev.server.manager.impl;
+
+import java.io.IOException;
+import java.util.concurrent.ExecutorService;
+
+import javax.inject.Inject;
+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.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.onedev.launcher.loader.Listen;
+import io.onedev.server.event.ProjectEvent;
+import io.onedev.server.model.support.WebHook;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.util.jackson.RestView;
+
+@Singleton
+public class DefaultWebHookManager {
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultWebHookManager.class);
+
+ private static final String SIGNATURE_HEAD = "X-OneDev-Signature";
+
+ private final ObjectMapper mapper;
+
+ private final ExecutorService executor;
+
+ @Inject
+ public DefaultWebHookManager(ObjectMapper mapper, ExecutorService executor) {
+ this.mapper = mapper.copy();
+ this.mapper.setConfig(this.mapper.getSerializationConfig().withView(RestView.class));
+ this.executor = executor;
+ }
+
+ @Sessional
+ @Listen
+ public void on(ProjectEvent event) {
+ String jsonOfEvent;
+ try {
+ jsonOfEvent = mapper.writeValueAsString(event);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ for (WebHook webHook: event.getProject().getWebHooks()) {
+ for (WebHook.EventType eventType: webHook.getEventTypes()) {
+ if (eventType.includes(event)) {
+ executor.submit(new Runnable() {
+
+ @Override
+ public void run() {
+ CloseableHttpClient client = HttpClients.createDefault();
+ try {
+ HttpPost httpPost = new HttpPost(webHook.getPostUrl());
+
+ StringEntity entity = new StringEntity(jsonOfEvent);
+ httpPost.setEntity(entity);
+ httpPost.setHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON);
+ httpPost.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+ httpPost.setHeader(SIGNATURE_HEAD, webHook.getSecret());
+
+ CloseableHttpResponse response = client.execute(httpPost);
+ try {
+ HttpEntity responseEntity = response.getEntity();
+ String responseText = EntityUtils.toString(responseEntity);
+ if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK)
+ logger.error("Error calling web hooks: " + responseText);
+ } finally {
+ try {
+ response.close();
+ } catch (IOException e) {
+ }
+ }
+ } catch (IOException e) {
+ logger.error("Error calling web hooks", e);
+ } finally {
+ try {
+ client.close();
+ } catch (IOException e) {
+ }
+ }
+ }
+
+ });
+ break;
+ }
+ }
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.java
index 04e03fb3a1..dd0861fa13 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.java
@@ -10,7 +10,7 @@ import java.util.concurrent.TimeoutException;
import javax.inject.Singleton;
import io.onedev.launcher.loader.Listen;
-import io.onedev.server.event.lifecycle.SystemStopping;
+import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.manager.WorkExecutor;
import io.onedev.utils.concurrent.PrioritizedCallable;
import io.onedev.utils.concurrent.PrioritizedExecutor;
diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.java
index 99816cfab3..db59dfaa0e 100644
--- a/core/src/main/java/io/onedev/server/model/Issue.java
+++ b/core/src/main/java/io/onedev/server/model/Issue.java
@@ -32,6 +32,7 @@ import org.apache.commons.lang3.StringUtils;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
+import com.fasterxml.jackson.annotation.JsonView;
import com.google.common.collect.Lists;
import edu.emory.mathcs.backport.java.util.Collections;
@@ -45,6 +46,7 @@ import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.facade.IssueFacade;
import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.jackson.DefaultView;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.annotation.Editable;
@@ -108,10 +110,12 @@ public class Issue extends AbstractEntity implements Referenceable {
// used for number search in markdown editor
@Column(nullable=false)
+ @JsonView(DefaultView.class)
private String numberStr;
// used for title search in markdown editor
@Column(nullable=false)
+ @JsonView(DefaultView.class)
private String noSpaceTitle;
@Embedded
diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.java
index e72e4d4431..e82e0d866c 100644
--- a/core/src/main/java/io/onedev/server/model/Project.java
+++ b/core/src/main/java/io/onedev/server/model/Project.java
@@ -58,6 +58,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.validator.constraints.NotEmpty;
+import com.fasterxml.jackson.annotation.JsonView;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
@@ -88,6 +89,7 @@ import io.onedev.server.model.support.BranchProtection;
import io.onedev.server.model.support.CommitMessageTransformSetting;
import io.onedev.server.model.support.NamedCommitQuery;
import io.onedev.server.model.support.TagProtection;
+import io.onedev.server.model.support.WebHook;
import io.onedev.server.model.support.build.NamedBuildQuery;
import io.onedev.server.model.support.codecomment.NamedCodeCommentQuery;
import io.onedev.server.model.support.issue.IssueBoard;
@@ -99,6 +101,7 @@ import io.onedev.server.persistence.UnitOfWork;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
import io.onedev.server.util.facade.ProjectFacade;
+import io.onedev.server.util.jackson.DefaultView;
import io.onedev.server.util.validation.annotation.ProjectName;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Markdown;
@@ -136,6 +139,7 @@ public class Project extends AbstractEntity {
@Lob
@Column(length=65535, name="COMMIT_MSG_TRANSFORM")
+ @JsonView(DefaultView.class)
private CommitMessageTransformSetting commitMessageTransformSetting;
@Column(nullable=false)
@@ -153,10 +157,12 @@ public class Project extends AbstractEntity {
@Lob
@Column(nullable=false, length=65535)
+ @JsonView(DefaultView.class)
private ArrayList<BranchProtection> branchProtections = new ArrayList<>();
@Lob
@Column(nullable=false, length=65535)
+ @JsonView(DefaultView.class)
private ArrayList<TagProtection> tagProtections = new ArrayList<>();
@Column(nullable=false)
@@ -200,36 +206,49 @@ public class Project extends AbstractEntity {
@Lob
@Column(length=65535)
+ @JsonView(DefaultView.class)
private IssueWorkflow issueWorkflow;
@Lob
@Column(length=65535)
+ @JsonView(DefaultView.class)
private ArrayList<NamedIssueQuery> savedIssueQueries;
@Lob
@Column(length=65535)
+ @JsonView(DefaultView.class)
private ArrayList<NamedCommitQuery> savedCommitQueries;
@Lob
@Column(length=65535)
+ @JsonView(DefaultView.class)
private ArrayList<NamedPullRequestQuery> savedPullRequestQueries;
@Lob
@Column(length=65535)
+ @JsonView(DefaultView.class)
private ArrayList<NamedCodeCommentQuery> savedCodeCommentQueries;
@Lob
@Column(length=65535)
+ @JsonView(DefaultView.class)
private ArrayList<NamedBuildQuery> savedBuildQueries;
@Lob
@Column(length=65535)
+ @JsonView(DefaultView.class)
private ArrayList<String> issueListFields;
@Lob
@Column(length=65535)
+ @JsonView(DefaultView.class)
private ArrayList<IssueBoard> issueBoards;
+ @Lob
+ @Column(length=65535)
+ @JsonView(DefaultView.class)
+ private ArrayList<WebHook> webHooks;
+
private transient Repository repository;
private transient Map<BlobIdent, Blob> blobCache;
@@ -1134,6 +1153,16 @@ public class Project extends AbstractEntity {
this.issueBoards = issueBoards;
}
+ public ArrayList<WebHook> getWebHooks() {
+ if (webHooks == null)
+ webHooks = new ArrayList<>();
+ return webHooks;
+ }
+
+ public void setWebHooks(ArrayList<WebHook> webHooks) {
+ this.webHooks = webHooks;
+ }
+
@Nullable
public TagProtection getTagProtection(String tagName, User user) {
for (TagProtection protection: tagProtections) {
diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.java
index 30fb2c9765..0acedab7d5 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -60,6 +60,7 @@ import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.diff.WhitespaceOption;
+import io.onedev.server.util.jackson.DefaultView;
import io.onedev.server.util.jackson.RestView;
@Entity
@@ -126,10 +127,12 @@ public class PullRequest extends AbstractEntity implements Referenceable {
// used for number search in markdown editor
@Column(nullable=false)
+ @JsonView(DefaultView.class)
private String numberStr;
// used for title search in markdown editor
@Column(nullable=false)
+ @JsonView(DefaultView.class)
private String noSpaceTitle;
@Version
diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.java
index 920a1f8f26..388bbfca2f 100644
--- a/core/src/main/java/io/onedev/server/model/User.java
+++ b/core/src/main/java/io/onedev/server/model/User.java
@@ -50,6 +50,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {
private String name;
@Column(length=1024)
+ @JsonView(DefaultView.class)
private String password;
private String fullName;
@@ -128,7 +129,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {
@Editable(order=150)
@Password(confirmative=true, autoComplete="new-password")
- @JsonView(DefaultView.class)
@NotEmpty
public String getPassword() {
return password;
diff --git a/core/src/main/java/io/onedev/server/model/support/WebHook.java b/core/src/main/java/io/onedev/server/model/support/WebHook.java
new file mode 100644
index 0000000000..d2d120df1e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/WebHook.java
@@ -0,0 +1,106 @@
+package io.onedev.server.model.support;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.validation.constraints.Size;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.event.Event;
+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.web.editable.annotation.Editable;
+
+@Editable
+public class WebHook implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public enum EventType {
+ CODE_PUSH {
+
+ @Override
+ public boolean includes(Event event) {
+ return event instanceof RefUpdated;
+ }
+
+ },
+ PULL_REQUEST {
+
+ @Override
+ public boolean includes(Event event) {
+ return event instanceof PullRequestEvent;
+ }
+
+ },
+ ISSUE {
+
+ @Override
+ public boolean includes(Event event) {
+ return event instanceof IssueEvent;
+ }
+
+ },
+ CODE_COMMENT {
+
+ @Override
+ public boolean includes(Event event) {
+ return event instanceof CodeCommentEvent;
+ }
+
+ },
+ BUILD {
+
+ @Override
+ public boolean includes(Event event) {
+ return event instanceof BuildEvent;
+ }
+
+ };
+
+ public abstract boolean includes(Event event);
+ }
+
+ private String postUrl;
+
+ private List<EventType> eventTypes;
+
+ private String secret = RandomStringUtils.randomAlphanumeric(20);
+
+ @Editable(order=100, description="The URL of the server endpoint that will receive the webhook POST requests")
+ @NotEmpty
+ public String getPostUrl() {
+ return postUrl;
+ }
+
+ public void setPostUrl(String postUrl) {
+ this.postUrl = postUrl;
+ }
+
+ @Editable(order=200)
+ @Size(min=1, message="At least one event type needs to be selected")
+ public List<EventType> getEventTypes() {
+ return eventTypes;
+ }
+
+ public void setEventTypes(List<EventType> eventTypes) {
+ this.eventTypes = eventTypes;
+ }
+
+ @Editable(order=300, description="The secret which allows you to ensure that POST requests sent to the payload URL are "
+ + "from OneDev. When you set a secret you'll receive the X-OneDev-Signature header in the webhook POST request")
+ @NotEmpty
+ public String getSecret() {
+ return secret;
+ }
+
+ public void setSecret(String secret) {
+ this.secret = secret;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/BatchUpdateData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/BatchUpdateData.java
index 9d54e30220..a997090cd5 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/BatchUpdateData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/BatchUpdateData.java
@@ -1,11 +1,13 @@
package io.onedev.server.model.support.issue.changedata;
+import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
import org.apache.wicket.Component;
-import org.apache.wicket.util.lang.Objects;
+
+import com.google.common.base.Objects;
import io.onedev.server.model.IssueAction;
import io.onedev.server.model.Milestone;
@@ -35,22 +37,36 @@ public class BatchUpdateData extends FieldChangeData {
this.oldMilestone = oldMilestone!=null?oldMilestone.getName():null;
this.newMilestone = newMilestone!=null?newMilestone.getName():null;
this.comment = comment;
-
+ }
+
+ @Override
+ protected List<String> getOldLines() {
+ List<String> oldLines = super.getOldLines();
if (!Objects.equal(oldMilestone, newMilestone)) {
if (oldMilestone != null)
- oldLines.add(0, "Milestone: " + oldMilestone.getName());
+ oldLines.add(0, "Milestone: " + oldMilestone);
else
oldLines.add(0, "Milestone: ");
+ }
+ if (!Objects.equal(oldState, newState)) {
+ oldLines.add(0, "State: " + oldState);
+ }
+ return oldLines;
+ }
+
+ @Override
+ protected List<String> getNewLines() {
+ List<String> newLines = super.getNewLines();
+ if (!Objects.equal(oldMilestone, newMilestone)) {
if (newMilestone != null)
- newLines.add(0, "Milestone: " + newMilestone.getName());
+ newLines.add(0, "Milestone: " + newMilestone);
else
newLines.add(0, "Milestone: ");
}
-
if (!Objects.equal(oldState, newState)) {
- oldLines.add(0, "State: " + oldState);
newLines.add(0, "State: " + newState);
}
+ return newLines;
}
public String getNewState() {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java
index 4e361805dc..21a6e4bbe2 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java
@@ -26,39 +26,83 @@ public class FieldChangeData implements ActionData {
private static final long serialVersionUID = 1L;
- protected final List<String> oldLines = new ArrayList<>();
+ protected final Map<String, IssueField> oldFields;
- protected final List<String> newLines = new ArrayList<>();
+ protected final Map<String, IssueField> newFields;
- protected final Map<String, String> newUserNames = new HashMap<>();
+ public FieldChangeData(Map<String, IssueField> oldFields, Map<String, IssueField> newFields) {
+ this.oldFields = copyNonEmptyFields(oldFields);
+ this.newFields = copyNonEmptyFields(newFields);
+ }
- protected final Map<String, String> newTeamNames = new HashMap<>();
+ protected List<String> getOldLines() {
+ List<String> oldLines = new ArrayList<>();
+ for (IssueField oldField: oldFields.values()) {
+ IssueField newField = newFields.get(oldField.getName());
+ if (newField == null || !describe(oldField).equals(describe(newField)))
+ oldLines.add(describe(oldField));
+ }
+ for (IssueField newField: newFields.values()) {
+ if (!oldFields.containsKey(newField.getName()))
+ oldLines.add("");
+ }
+ return oldLines;
+ }
- public FieldChangeData(Map<String, IssueField> oldFields, Map<String, IssueField> newFields) {
- oldFields = copyNonEmptyFields(oldFields);
- newFields = copyNonEmptyFields(newFields);
-
+ protected List<String> getNewLines() {
+ List<String> newLines = new ArrayList<>();
for (IssueField oldField: oldFields.values()) {
IssueField newField = newFields.get(oldField.getName());
if (newField != null) {
if (!describe(oldField).equals(describe(newField))) {
- oldLines.add(describe(oldField));
newLines.add(describe(newField));
- extractUsersAndGroups(newField);
}
} else {
- oldLines.add(describe(oldField));
newLines.add("");
}
}
for (IssueField newField: newFields.values()) {
- IssueField oldField = oldFields.get(newField.getName());
- if (oldField == null) {
- oldLines.add("");
+ if (!oldFields.containsKey(newField.getName()))
newLines.add(describe(newField));
- extractUsersAndGroups(newField);
+ }
+ return newLines;
+ }
+
+ protected Map<String, String> getNewUsers() {
+ Map<String, String> newUsers = new HashMap<>();
+ for (IssueField oldField: oldFields.values()) {
+ IssueField newField = newFields.get(oldField.getName());
+ if (newField != null && !describe(oldField).equals(describe(newField))
+ && newField.getType().equals(InputSpec.USER) && !newField.getValues().isEmpty())
+ newUsers.put(newField.getName(), newField.getValues().iterator().next());
+ }
+ for (IssueField newField: newFields.values()) {
+ if (!oldFields.containsKey(newField.getName()) && newField.getType().equals(InputSpec.USER)
+ && !newField.getValues().isEmpty()) {
+ newUsers.put(newField.getName(), newField.getValues().iterator().next());
+ }
+ }
+ return newUsers;
+ }
+
+ protected Map<String, String> getNewTeams() {
+ Map<String, String> newTeams = new HashMap<>();
+ for (IssueField oldField: oldFields.values()) {
+ IssueField newField = newFields.get(oldField.getName());
+ if (newField != null
+ && !describe(oldField).equals(describe(newField))
+ && newField.getType().equals(InputSpec.TEAM)
+ && !newField.getValues().isEmpty())
+ newTeams.put(newField.getName(), newField.getValues().iterator().next());
+ }
+ for (IssueField newField: newFields.values()) {
+ if (!oldFields.containsKey(newField.getName())
+ && newField.getType().equals(InputSpec.TEAM)
+ && !newField.getValues().isEmpty()) {
+ newTeams.put(newField.getName(), newField.getValues().iterator().next());
}
}
+ return newTeams;
}
private Map<String, IssueField> copyNonEmptyFields(Map<String, IssueField> fields) {
@@ -70,20 +114,13 @@ public class FieldChangeData implements ActionData {
return copy;
}
- private void extractUsersAndGroups(IssueField field) {
- if (field.getType().equals(InputSpec.USER) && !field.getValues().isEmpty())
- newUserNames.put(field.getName(), field.getValues().iterator().next());
- if (field.getType().equals(InputSpec.TEAM) && !field.getValues().isEmpty())
- newTeamNames.put(field.getName(), field.getValues().iterator().next());
- }
-
private String describe(IssueField field) {
return field.getName() + ": " + StringUtils.join(field.getValues(), ", ");
}
@Override
public Component render(String componentId, IssueAction action) {
- return new PlainDiffPanel(componentId, oldLines, "a.txt", newLines, "b.txt", true);
+ return new PlainDiffPanel(componentId, getOldLines(), "a.txt", getNewLines(), "b.txt", true);
}
@Override
@@ -111,12 +148,12 @@ public class FieldChangeData implements ActionData {
@Override
public List<String> getOldLines() {
- return oldLines;
+ return FieldChangeData.this.getOldLines();
}
@Override
public List<String> getNewLines() {
- return newLines;
+ return FieldChangeData.this.getNewLines();
}
@Override
@@ -135,7 +172,7 @@ public class FieldChangeData implements ActionData {
@Override
public Map<String, User> getNewUsers(Project project) {
Map<String, User> newUsers = new HashMap<>();
- for (Map.Entry<String, String> entry: newUserNames.entrySet()) {
+ for (Map.Entry<String, String> entry: getNewUsers().entrySet()) {
User user = OneDev.getInstance(UserManager.class).findByName(entry.getValue());
if (user != null)
newUsers.put(entry.getKey(), user);
@@ -146,7 +183,7 @@ public class FieldChangeData implements ActionData {
@Override
public Map<String, Team> getNewTeams(Project project) {
Map<String, Team> newTeams = new HashMap<>();
- for (Map.Entry<String, String> entry: newTeamNames.entrySet()) {
+ for (Map.Entry<String, String> entry: getNewTeams().entrySet()) {
Team team = OneDev.getInstance(TeamManager.class).find(project, entry.getValue());
if (team != null)
newTeams.put(entry.getKey(), team);
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java
index cb61d697ae..6e9367b4ee 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java
@@ -1,5 +1,6 @@
package io.onedev.server.model.support.issue.changedata;
+import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
@@ -27,9 +28,20 @@ public class StateChangeData extends FieldChangeData {
this.oldState = oldState;
this.newState = newState;
this.comment = comment;
-
+ }
+
+ @Override
+ protected List<String> getOldLines() {
+ List<String> oldLines = super.getOldLines();
oldLines.add(0, "State: " + oldState);
+ return oldLines;
+ }
+
+ @Override
+ protected List<String> getNewLines() {
+ List<String> newLines = super.getOldLines();
newLines.add(0, "State: " + newState);
+ return newLines;
}
public String getNewState() {
diff --git a/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java b/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java
index 9715dbdfc1..dbd507bf99 100644
--- a/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java
+++ b/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java
@@ -15,6 +15,8 @@ import org.hibernate.criterion.Projections;
import io.onedev.launcher.loader.ListenerRegistry;
import io.onedev.launcher.loader.ManagedSerializedForm;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.persistence.UnitOfWork;
import io.onedev.server.persistence.annotation.Sessional;
diff --git a/core/src/main/java/io/onedev/server/persistence/dao/EntityRemoved.java b/core/src/main/java/io/onedev/server/persistence/dao/EntityRemoved.java
deleted file mode 100644
index 203940721f..0000000000
--- a/core/src/main/java/io/onedev/server/persistence/dao/EntityRemoved.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.onedev.server.persistence.dao;
-
-import io.onedev.server.model.AbstractEntity;
-
-public class EntityRemoved {
-
- private final AbstractEntity entity;
-
- public EntityRemoved(AbstractEntity entity) {
- this.entity = entity;
- }
-
- public AbstractEntity getEntity() {
- return entity;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java b/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java
index a89f8e5f32..92f6a88133 100644
--- a/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java
+++ b/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java
@@ -46,11 +46,11 @@ import com.google.common.base.Throwables;
import io.onedev.jsymbol.Symbol;
import io.onedev.jsymbol.SymbolExtractorRegistry;
import io.onedev.launcher.loader.Listen;
-import io.onedev.server.event.lifecycle.SystemStopping;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.manager.StorageManager;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.EntityRemoved;
import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.search.code.query.BlobQuery;
diff --git a/core/src/main/java/io/onedev/server/util/jackson/git/ObjectIdDeserializer.java b/core/src/main/java/io/onedev/server/util/jackson/git/ObjectIdDeserializer.java
index f6529dbf52..750a36a320 100644
--- a/core/src/main/java/io/onedev/server/util/jackson/git/ObjectIdDeserializer.java
+++ b/core/src/main/java/io/onedev/server/util/jackson/git/ObjectIdDeserializer.java
@@ -14,7 +14,7 @@ public class ObjectIdDeserializer extends JsonDeserializer<ObjectId> {
@Override
public ObjectId deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException {
- return ObjectId.fromRaw(jp.getBinaryValue());
+ return ObjectId.fromString(jp.getValueAsString());
}
}
diff --git a/core/src/main/java/io/onedev/server/util/jackson/git/ObjectIdSerializer.java b/core/src/main/java/io/onedev/server/util/jackson/git/ObjectIdSerializer.java
index 84edacc1d6..0cad36affd 100644
--- a/core/src/main/java/io/onedev/server/util/jackson/git/ObjectIdSerializer.java
+++ b/core/src/main/java/io/onedev/server/util/jackson/git/ObjectIdSerializer.java
@@ -14,9 +14,7 @@ public class ObjectIdSerializer extends JsonSerializer<ObjectId> {
@Override
public void serialize(ObjectId value, JsonGenerator jgen, SerializerProvider provider)
throws IOException, JsonGenerationException {
- byte[] bytes = new byte[20];
- value.copyRawTo(bytes, 0);
- jgen.writeBinary(bytes);
+ jgen.writeString(value.name());
}
}
diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index 64478c8033..84c048404f 100644
--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -61,6 +61,7 @@ import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage
import io.onedev.server.web.page.project.setting.team.NewTeamPage;
import io.onedev.server.web.page.project.setting.team.TeamEditPage;
import io.onedev.server.web.page.project.setting.team.TeamListPage;
+import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;
import io.onedev.server.web.page.project.stats.ProjectContribsPage;
import io.onedev.server.web.page.project.stats.SourceLinesPage;
import io.onedev.server.web.page.project.tags.ProjectTagsPage;
@@ -224,6 +225,7 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("projects/${project}/settings/configurations", ConfigurationListPage.class));
add(new OnePageMapper("projects/${project}/settings/configurations/new", NewConfigurationPage.class));
add(new OnePageMapper("projects/${project}/settings/configurations/${configuration}", ConfigurationEditPage.class));
+ add(new OnePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));
add(new OnePageMapper("projects/${project}/no-commits", NoCommitsPage.class));
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
index 5bf5466e80..00b182fd94 100644
--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
@@ -4,8 +4,9 @@
<th wicket:id="headers">
<span wicket:id="header"></span>
<span wicket:id="required" class="required"></span>
+ <span wicket:id="help" class="fa fa-question-circle"></span>
</th>
- <th>&nbsp;</th>
+ <th class="actions">&nbsp;</th>
</thead>
<tbody>
<tr wicket:id="elements">
diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
index 6c066b82b4..1351a8d927 100644
--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
@@ -113,16 +113,25 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
@Override
protected void populateItem(ListItem<PropertyContext<Serializable>> item) {
- item.add(new Label("header", EditableUtils.getDisplayName(item.getModelObject().getPropertyGetter())));
- item.add(AttributeAppender.append("class", "property-" + item.getModelObject().getPropertyName()));
+ PropertyContext<Serializable> propertyContext = item.getModelObject();
+ item.add(new Label("header", EditableUtils.getDisplayName(propertyContext.getPropertyGetter())));
+ item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));
String required;
- if (item.getModelObject().isPropertyRequired() && item.getModelObject().getPropertyClass() != boolean.class)
+ if (propertyContext.isPropertyRequired() && propertyContext.getPropertyClass() != boolean.class)
required = "*";
else
required = "&nbsp;";
item.add(new Label("required", required).setEscapeModelStrings(false));
+ String description = EditableUtils.getDescription(propertyContext.getPropertyGetter());
+ if (description != null) {
+ WebMarkupContainer help = new WebMarkupContainer("help");
+ help.add(AttributeAppender.append("title", description));
+ item.add(help);
+ } else {
+ item.add(new WebMarkupContainer("help").setVisible(false));
+ }
}
});
diff --git a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
index b90a321668..ebc2e710dc 100644
--- a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
@@ -16,6 +16,7 @@ import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.web.component.select2.Select2MultiChoice;
import io.onedev.server.web.component.stringchoice.StringMultiChoice;
+import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.ErrorContext;
import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -30,7 +31,7 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {
public EnumListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<Enum<?>>> propertyModel) {
super(id, propertyDescriptor, propertyModel);
- enumClass = (Class<Enum>) propertyDescriptor.getPropertyGetter().getReturnType();
+ enumClass = (Class<Enum>) EditableUtils.getElementClass(propertyDescriptor.getPropertyGetter().getGenericReturnType());
}
private String getDisplayValue(String choice) {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
index a89d474290..645f0321ae 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
@@ -26,6 +26,7 @@ import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage
import io.onedev.server.web.page.project.setting.team.NewTeamPage;
import io.onedev.server.web.page.project.setting.team.TeamEditPage;
import io.onedev.server.web.page.project.setting.team.TeamListPage;
+import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;
@SuppressWarnings("serial")
public abstract class ProjectSettingPage extends ProjectPage {
@@ -56,6 +57,7 @@ public abstract class ProjectSettingPage extends ProjectPage {
tabs.add(new ProjectSettingTab("Issue Fields", "fa fa-fw fa-list-ul", IssueFieldsPage.class));
tabs.add(new ProjectSettingTab("Issue States", "fa fa-fw fa-check", IssueStatesPage.class));
tabs.add(new ProjectSettingTab("Issue State Transitions", "fa fa-fw fa-exchange", StateTransitionsPage.class));
+ tabs.add(new ProjectSettingTab("Web Hooks", "fa fa-fw fa-volume-up", WebHooksPage.class));
tabs.add(new ProjectSettingTab("Build Configurations", "fa fa-fw fa-cube", ConfigurationListPage.class,
NewConfigurationPage.class, ConfigurationEditPage.class));
return tabs;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHookCssResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHookCssResourceReference.java
new file mode 100644
index 0000000000..8001e5466e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHookCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.page.project.setting.webhook;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class WebHookCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public WebHookCssResourceReference() {
+ super(WebHookCssResourceReference.class, "web-hook.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksEditBean.java b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksEditBean.java
new file mode 100644
index 0000000000..b36f38e40f
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksEditBean.java
@@ -0,0 +1,25 @@
+package io.onedev.server.web.page.project.setting.webhook;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+import io.onedev.server.model.support.WebHook;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class WebHooksEditBean implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private ArrayList<WebHook> webHooks = new ArrayList<>();
+
+ @Editable
+ public ArrayList<WebHook> getWebHooks() {
+ return webHooks;
+ }
+
+ public void setWebHooks(ArrayList<WebHook> webHooks) {
+ this.webHooks = webHooks;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html
new file mode 100644
index 0000000000..ff32fe8c27
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html
@@ -0,0 +1,14 @@
+<wicket:extend>
+ <div class="web-hook list">
+ <form wicket:id="form">
+ <div wicket:id="feedback"></div>
+ <div wicket:id="editor"></div>
+ <div class="help-block">
+ <i class="fa fa-info-circle"></i> OneDev will post event data in JSON format to specified URLs when subscribed events happen
+ </div>
+ <div class="actions">
+ <input type="submit" value="Save" class="btn btn-primary"></input>
+ </div>
+ </form>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java
new file mode 100644
index 0000000000..160f0eb837
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java
@@ -0,0 +1,54 @@
+package io.onedev.server.web.page.project.setting.webhook;
+
+import java.io.Serializable;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.ProjectManager;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.page.project.setting.ProjectSettingPage;
+
+@SuppressWarnings("serial")
+public class WebHooksPage extends ProjectSettingPage {
+
+ public WebHooksPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ WebHooksEditBean bean = new WebHooksEditBean();
+ bean.setWebHooks(getProject().getWebHooks());
+ PropertyEditor<Serializable> editor =
+ PropertyContext.editBean("editor", bean, "webHooks");
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+ getProject().setWebHooks(bean.getWebHooks());
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ getSession().success("Web hooks saved");
+ }
+
+ };
+ form.add(new NotificationPanel("feedback", form));
+ form.add(editor);
+ add(form);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new WebHookCssResourceReference()));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/web-hook.css b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/web-hook.css
new file mode 100644
index 0000000000..cf5b434489
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/web-hook.css
@@ -0,0 +1,10 @@
+.web-hook.list table thead th {
+ font-weight: bold !important;
+}
+.web-hook.list table thead th.property-eventTypes,
+.web-hook.list table thead th.property-secret {
+ width: 25%;
+}
+.web-hook.list table thead th.actions {
+ width: 60px;
+}