Unverified Commit 5d061641 authored by Jérémie Bresson's avatar Jérémie Bresson Committed by GitHub
Browse files

Change User representation in Webhooks (#952)

Fixes #927
parent c3a99e9f
Showing with 84 additions and 27 deletions
+84 -27
...@@ -29,7 +29,7 @@ public class BuildEvent extends AbstractEvent { ...@@ -29,7 +29,7 @@ public class BuildEvent extends AbstractEvent {
private String buildFailureReason; private String buildFailureReason;
private Long projectId; private Long projectId;
private String projectName; private String projectName;
private User user; private EventUser user;
private BuildCommit commit; private BuildCommit commit;
private EventRepository repository; private EventRepository repository;
...@@ -163,11 +163,11 @@ public class BuildEvent extends AbstractEvent { ...@@ -163,11 +163,11 @@ public class BuildEvent extends AbstractEvent {
this.projectName = projectName; this.projectName = projectName;
} }
public User getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
......
...@@ -15,7 +15,7 @@ public class DeploymentEvent extends AbstractEvent { ...@@ -15,7 +15,7 @@ public class DeploymentEvent extends AbstractEvent {
private String environment; private String environment;
private EventProject project; private EventProject project;
private String shortSha; private String shortSha;
private User user; private EventUser user;
private String userUrl; private String userUrl;
private String commitUrl; private String commitUrl;
private String commitTitle; private String commitTitle;
...@@ -86,11 +86,11 @@ public class DeploymentEvent extends AbstractEvent { ...@@ -86,11 +86,11 @@ public class DeploymentEvent extends AbstractEvent {
this.shortSha = shortSha; this.shortSha = shortSha;
} }
public User getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
......
package org.gitlab4j.api.webhook;
import org.gitlab4j.api.utils.JacksonJson;
public class EventUser {
private Long id;
private String name;
private String username;
private String avatarUrl;
private String email;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getAvatarUrl() {
return avatarUrl;
}
public void setAvatarUrl(String avatarUrl) {
this.avatarUrl = avatarUrl;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
@Override
public String toString() {
return (JacksonJson.toJsonString(this));
}
}
...@@ -11,7 +11,7 @@ public class ExternalStatusCheckEvent { ...@@ -11,7 +11,7 @@ public class ExternalStatusCheckEvent {
private String objectKind; private String objectKind;
private String eventType; private String eventType;
private User user; private EventUser user;
private EventProject project; private EventProject project;
private EventRepository repository; private EventRepository repository;
private ObjectAttributes objectAttributes; private ObjectAttributes objectAttributes;
...@@ -36,11 +36,11 @@ public class ExternalStatusCheckEvent { ...@@ -36,11 +36,11 @@ public class ExternalStatusCheckEvent {
this.eventType = eventType; this.eventType = eventType;
} }
public User getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
......
...@@ -11,7 +11,7 @@ public class IssueEvent extends AbstractEvent { ...@@ -11,7 +11,7 @@ public class IssueEvent extends AbstractEvent {
public static final String X_GITLAB_EVENT = "Issue Hook"; public static final String X_GITLAB_EVENT = "Issue Hook";
public static final String OBJECT_KIND = "issue"; public static final String OBJECT_KIND = "issue";
private User user; private EventUser user;
private EventProject project; private EventProject project;
private EventRepository repository; private EventRepository repository;
private ObjectAttributes objectAttributes; private ObjectAttributes objectAttributes;
...@@ -29,11 +29,11 @@ public class IssueEvent extends AbstractEvent { ...@@ -29,11 +29,11 @@ public class IssueEvent extends AbstractEvent {
throw new RuntimeException("Invalid object_kind (" + objectKind + "), must be '" + OBJECT_KIND + "'"); throw new RuntimeException("Invalid object_kind (" + objectKind + "), must be '" + OBJECT_KIND + "'");
} }
public User getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
......
...@@ -25,7 +25,7 @@ public class JobEvent extends AbstractEvent { ...@@ -25,7 +25,7 @@ public class JobEvent extends AbstractEvent {
private String jobFailureReason; private String jobFailureReason;
private Long projectId; private Long projectId;
private String projectName; private String projectName;
private User user; private EventUser user;
private BuildCommit commit; private BuildCommit commit;
private EventRepository repository; private EventRepository repository;
...@@ -159,11 +159,11 @@ public class JobEvent extends AbstractEvent { ...@@ -159,11 +159,11 @@ public class JobEvent extends AbstractEvent {
this.projectName = projectName; this.projectName = projectName;
} }
public User getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
......
...@@ -12,7 +12,7 @@ public class MergeRequestEvent extends AbstractEvent { ...@@ -12,7 +12,7 @@ public class MergeRequestEvent extends AbstractEvent {
public static final String X_GITLAB_EVENT = "Merge Request Hook"; public static final String X_GITLAB_EVENT = "Merge Request Hook";
public static final String OBJECT_KIND = "merge_request"; public static final String OBJECT_KIND = "merge_request";
private User user; private EventUser user;
private EventProject project; private EventProject project;
private EventRepository repository; private EventRepository repository;
private ObjectAttributes objectAttributes; private ObjectAttributes objectAttributes;
...@@ -30,11 +30,11 @@ public class MergeRequestEvent extends AbstractEvent { ...@@ -30,11 +30,11 @@ public class MergeRequestEvent extends AbstractEvent {
throw new RuntimeException("Invalid object_kind (" + objectKind + "), must be '" + OBJECT_KIND + "'"); throw new RuntimeException("Invalid object_kind (" + objectKind + "), must be '" + OBJECT_KIND + "'");
} }
public User getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
......
...@@ -15,7 +15,7 @@ public class NoteEvent extends AbstractEvent { ...@@ -15,7 +15,7 @@ public class NoteEvent extends AbstractEvent {
public static final String X_GITLAB_EVENT = "Note Hook"; public static final String X_GITLAB_EVENT = "Note Hook";
public static final String OBJECT_KIND = "note"; public static final String OBJECT_KIND = "note";
private User user; private EventUser user;
private Long projectId; private Long projectId;
private EventProject project; private EventProject project;
private EventRepository repository; private EventRepository repository;
...@@ -35,11 +35,11 @@ public class NoteEvent extends AbstractEvent { ...@@ -35,11 +35,11 @@ public class NoteEvent extends AbstractEvent {
throw new RuntimeException("Invalid object_kind (" + objectKind + "), must be '" + OBJECT_KIND + "'"); throw new RuntimeException("Invalid object_kind (" + objectKind + "), must be '" + OBJECT_KIND + "'");
} }
public User getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
......
...@@ -14,7 +14,7 @@ public class PipelineEvent extends AbstractEvent { ...@@ -14,7 +14,7 @@ public class PipelineEvent extends AbstractEvent {
public static final String OBJECT_KIND = "pipeline"; public static final String OBJECT_KIND = "pipeline";
private ObjectAttributes objectAttributes; private ObjectAttributes objectAttributes;
private User user; private EventUser user;
private EventProject project; private EventProject project;
private EventCommit commit; private EventCommit commit;
private List<Job> jobs; private List<Job> jobs;
...@@ -36,11 +36,11 @@ public class PipelineEvent extends AbstractEvent { ...@@ -36,11 +36,11 @@ public class PipelineEvent extends AbstractEvent {
this.objectAttributes = objectAttributes; this.objectAttributes = objectAttributes;
} }
public User getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
......
...@@ -8,7 +8,7 @@ public class WikiPageEvent extends AbstractEvent { ...@@ -8,7 +8,7 @@ public class WikiPageEvent extends AbstractEvent {
public static final String X_GITLAB_EVENT = "Wiki Page Hook"; public static final String X_GITLAB_EVENT = "Wiki Page Hook";
public static final String OBJECT_KIND = "wiki_page"; public static final String OBJECT_KIND = "wiki_page";
private User user; private EventUser user;
private EventProject project; private EventProject project;
private Wiki wiki; private Wiki wiki;
private ObjectAttributes objectAttributes; private ObjectAttributes objectAttributes;
...@@ -22,11 +22,11 @@ public class WikiPageEvent extends AbstractEvent { ...@@ -22,11 +22,11 @@ public class WikiPageEvent extends AbstractEvent {
throw new RuntimeException("Invalid object_kind (" + objectKind + "), must be '" + OBJECT_KIND + "'"); throw new RuntimeException("Invalid object_kind (" + objectKind + "), must be '" + OBJECT_KIND + "'");
} }
public User getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment