Change User representation in Webhooks (#952)

Fixes #927

Author: jmini

src/main/java/org/gitlab4j/api/webhook/BuildEvent.java

@@ -29,7 +29,7 @@ public class BuildEvent extends AbstractEvent {
     private String buildFailureReason;
     private Long projectId;
     private String projectName;
-    private User user;
+    private EventUser user;
     private BuildCommit commit;
     private EventRepository repository;
 
@@ -163,11 +163,11 @@ public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User user) {
+    public void setUser(EventUser user) {
         this.user = user;
     }
 

src/main/java/org/gitlab4j/api/webhook/DeploymentEvent.java

@@ -15,7 +15,7 @@ public class DeploymentEvent extends AbstractEvent {
     private String environment;
     private EventProject project;
     private String shortSha;
-    private User user;
+    private EventUser user;
     private String userUrl;
     private String commitUrl;
     private String commitTitle;
@@ -86,11 +86,11 @@ public void setShortSha(String shortSha) {
         this.shortSha = shortSha;
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User user) {
+    public void setUser(EventUser user) {
         this.user = user;
     }
 

src/main/java/org/gitlab4j/api/webhook/EventUser.java

@@ -0,0 +1,57 @@
+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));
+    }
+}

src/main/java/org/gitlab4j/api/webhook/ExternalStatusCheckEvent.java

@@ -11,7 +11,7 @@ public class ExternalStatusCheckEvent {
 
     private String objectKind;
     private String eventType;
-    private User user;
+    private EventUser user;
     private EventProject project;
     private EventRepository repository;
     private ObjectAttributes objectAttributes;
@@ -36,11 +36,11 @@ public void setEventType(String eventType) {
         this.eventType = eventType;
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User user) {
+    public void setUser(EventUser user) {
         this.user = user;
     }
 

src/main/java/org/gitlab4j/api/webhook/IssueEvent.java

@@ -11,7 +11,7 @@ public class IssueEvent extends AbstractEvent {
     public static final String X_GITLAB_EVENT = "Issue Hook";
     public static final String OBJECT_KIND = "issue";
 
-    private User user;
+    private EventUser user;
     private EventProject project;
     private EventRepository repository;
     private ObjectAttributes objectAttributes;
@@ -29,11 +29,11 @@ public void setObjectKind(String objectKind) {
             throw new RuntimeException("Invalid object_kind (" + objectKind + "), must be '" + OBJECT_KIND + "'");
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User user) {
+    public void setUser(EventUser user) {
         this.user = user;
     }
 

src/main/java/org/gitlab4j/api/webhook/JobEvent.java

@@ -25,7 +25,7 @@ public class JobEvent extends AbstractEvent {
     private String jobFailureReason;
     private Long projectId;
     private String projectName;
-    private User user;
+    private EventUser user;
     private BuildCommit commit;
     private EventRepository repository;
 
@@ -159,11 +159,11 @@ public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User user) {
+    public void setUser(EventUser user) {
         this.user = user;
     }
 

src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java

@@ -12,7 +12,7 @@ public class MergeRequestEvent extends AbstractEvent {
     public static final String X_GITLAB_EVENT = "Merge Request Hook";
     public static final String OBJECT_KIND = "merge_request";
 
-    private User user;
+    private EventUser user;
     private EventProject project;
     private EventRepository repository;
     private ObjectAttributes objectAttributes;
@@ -30,11 +30,11 @@ public void setObjectKind(String objectKind) {
             throw new RuntimeException("Invalid object_kind (" + objectKind + "), must be '" + OBJECT_KIND + "'");
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User user) {
+    public void setUser(EventUser user) {
         this.user = user;
     }
 

src/main/java/org/gitlab4j/api/webhook/NoteEvent.java

@@ -15,7 +15,7 @@ public class NoteEvent extends AbstractEvent {
     public static final String X_GITLAB_EVENT = "Note Hook";
     public static final String OBJECT_KIND = "note";
 
-    private User user;
+    private EventUser user;
     private Long projectId;
     private EventProject project;
     private EventRepository repository;
@@ -35,11 +35,11 @@ public void setObjectKind(String objectKind) {
             throw new RuntimeException("Invalid object_kind (" + objectKind + "), must be '" + OBJECT_KIND + "'");
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User user) {
+    public void setUser(EventUser user) {
         this.user = user;
     }
 

src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java

@@ -14,7 +14,7 @@ public class PipelineEvent extends AbstractEvent {
     public static final String OBJECT_KIND = "pipeline";
 
     private ObjectAttributes objectAttributes;
-    private User user;
+    private EventUser user;
     private EventProject project;
     private EventCommit commit;
     private List<Job> jobs;
@@ -36,11 +36,11 @@ public void setObjectAttributes(ObjectAttributes objectAttributes) {
         this.objectAttributes = objectAttributes;
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User user) {
+    public void setUser(EventUser user) {
         this.user = user;
     }
 

src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java

@@ -8,7 +8,7 @@ public class WikiPageEvent extends AbstractEvent {
     public static final String X_GITLAB_EVENT = "Wiki Page Hook";
     public static final String OBJECT_KIND = "wiki_page";
 
-    private User user;
+    private EventUser user;
     private EventProject project;
     private Wiki wiki;
     private ObjectAttributes objectAttributes;
@@ -22,11 +22,11 @@ public void setObjectKind(String objectKind) {
             throw new RuntimeException("Invalid object_kind (" + objectKind + "), must be '" + OBJECT_KIND + "'");
     }
 
-    public User getUser() {
+    public EventUser getUser() {
         return user;
     }
 
-    public void setUser(User user) {
+    public void setUser(EventUser user) {
         this.user = user;
     }