Improvements on GitlabProjectHook (timols#328)

- Adding new attributes on GitlabProjectHook
- Adding new signature on addProjectHook method
- Adding new signature on editProjectHook method

Author: ronerjr

src/main/java/org/gitlab/api/GitlabAPI.java

@@ -2391,7 +2391,7 @@ public GitlabProjectHook addProjectHook(GitlabProject project, String url, Strin
                 .to(tailUrl, GitlabProjectHook.class);
     }
 
-    public GitlabProjectHook addProjectHook(Serializable projectId, String url, boolean pushEvents, boolean issuesEvents, boolean mergeRequestEvents, boolean noteEvents, boolean tagPushEvents, boolean sslVerification, String token) throws IOException {
+    public GitlabProjectHook addProjectHook(Serializable projectId, String url, boolean pushEvents, boolean issuesEvents, boolean mergeRequestEvents, boolean noteEvents, boolean tagPushEvents, boolean sslVerification, boolean jobEvents, boolean pipelineEvents, boolean wikiPageEvents, String token) throws IOException {
         String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabProjectHook.URL;
 
         return dispatch()
@@ -2402,18 +2402,46 @@ public GitlabProjectHook addProjectHook(Serializable projectId, String url, bool
                 .with("note_events", noteEvents ? "true" : "false")
                 .with("tag_push_events", tagPushEvents ? "true" : "false")
                 .with("enable_ssl_verification", sslVerification ? "true" : "false")
+                .with("job_events", jobEvents ? "true" : "false")
+                .with("pipeline_events", pipelineEvents ? "true" : "false")
+                .with("wiki_page_events", wikiPageEvents ? "true" : "false")
                 .with("token", token)
                 .to(tailUrl, GitlabProjectHook.class);
     }
 
-    public GitlabProjectHook editProjectHook(GitlabProject project, String hookId, String url) throws IOException {
-        Query query = new Query()
-                .append("url", url);
+    public GitlabProjectHook addProjectHook(Serializable projectId, String url, GitlabProjectHook hook, String token) throws IOException {
+        return this.addProjectHook(projectId, url, hook.getPushEvents(), hook.getIssueEvents(), hook.isMergeRequestsEvents(),
+            hook.isNoteEvents(), hook.isTagPushEvents(), hook.isSslVerificationEnabled(), hook.isJobEvents(),
+            hook.isPipelineEvents(), hook.isWikiPageEvents(), token);
+    }
 
+    public GitlabProjectHook editProjectHook(GitlabProject project, String hookId, String url,
+        boolean pushEvents, boolean issuesEvents, boolean mergeRequestEvents, boolean noteEvents,
+        boolean tagPushEvents, boolean sslVerification, boolean jobEvents, boolean pipelineEvents,
+        boolean wikiPageEvents, String token) throws IOException {
+        Query query = new Query();
+        query.append("url", url);
+        query.append("push_events", String.valueOf(pushEvents));
+        query.append("issues_events", String.valueOf(issuesEvents));
+        query.append("merge_request_events", String.valueOf(mergeRequestEvents));
+        query.append("note_events", String.valueOf(noteEvents));
+        query.append("tag_push_events", String.valueOf(tagPushEvents));
+        query.append("enable_ssl_verification", String.valueOf(sslVerification));
+        query.append("job_events", String.valueOf(jobEvents));
+        query.append("pipeline_events", String.valueOf(pipelineEvents));
+        query.append("wiki_page_events", String.valueOf(wikiPageEvents));
+        query.append("token", token);
         String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabProjectHook.URL + "/" + hookId + query.toString();
         return retrieve().method(PUT).to(tailUrl, GitlabProjectHook.class);
     }
 
+    public GitlabProjectHook editProjectHook(GitlabProject project, GitlabProjectHook projectHook, String token) throws IOException {
+        return editProjectHook(project, projectHook.getId(), projectHook.getUrl(), projectHook.getPushEvents(),
+            projectHook.getIssueEvents(), projectHook.isMergeRequestsEvents(), projectHook.isNoteEvents(),
+            projectHook.isTagPushEvents(), projectHook.isSslVerificationEnabled(), projectHook.isJobEvents(),
+            projectHook.isWikiPageEvents(), projectHook.isPipelineEvents(), token);
+    }
+
     public void deleteProjectHook(GitlabProjectHook hook) throws IOException {
         String tailUrl = GitlabProject.URL + "/" + hook.getProjectId() + GitlabProjectHook.URL + "/" + hook.getId();
         retrieve().method(DELETE).to(tailUrl, Void.class);
@@ -3969,7 +3997,7 @@ public GitlabRunner getRunnerDetail(int id) throws IOException {
      * @param before If not null, include only events created before a particular date.
      * @param after If not null, include only events created before a
      * particular date.
-     * @param sort If null, uses the server's default, which is "desc"
+     * @param sortOrder If null, uses the server's default, which is "desc"
      */
     public List<GitlabEvent> getEvents(GitlabProject project,
                                        GitlabEvent.ActionType action,
@@ -3990,7 +4018,7 @@ public List<GitlabEvent> getEvents(GitlabProject project,
      * @param before If not null, include only events created before a particular date.
      * @param after If not null, include only events created before a
      * particular date.
-     * @param sort If null, uses the server's default, which is "desc"
+     * @param sortOrder If null, uses the server's default, which is "desc"
      */
     public List<GitlabEvent> getEvents(GitlabProject project,
                                        GitlabEvent.ActionType action,

src/main/java/org/gitlab/api/models/GitlabProjectHook.java

@@ -25,13 +25,25 @@ public class GitlabProjectHook {
 
     @JsonProperty("tag_push_events")
     private boolean tagPushEvents;
-    
+
     @JsonProperty("created_at")
     private Date createdAt;
 
     @JsonProperty("enable_ssl_verification")
     private boolean sslVerificationEnabled;
 
+    @JsonProperty("note_events")
+    private boolean noteEvents;
+
+    @JsonProperty("job_events")
+    private boolean jobEvents;
+
+    @JsonProperty("pipeline_events")
+    private boolean pipelineEvents;
+
+    @JsonProperty("wiki_page_events")
+    private boolean wikiPageEvents;
+
     public String getId() {
         return id;
     }
@@ -80,15 +92,14 @@ public void setMergeRequestsEvents(boolean mergeRequestsEvents) {
         this.mergeRequestsEvents = mergeRequestsEvents;
     }
 
-    
     public boolean isTagPushEvents() {
     	return tagPushEvents;
     }
-    
+
     public void setTagPushEvents(boolean tagPushEvents) {
     	this.tagPushEvents = tagPushEvents;
     }
-    
+
     public Date getCreatedAt() {
         return createdAt;
     }
@@ -105,4 +116,19 @@ public void setSslVerificationEnabled(boolean sslVerificationEnabled) {
         this.sslVerificationEnabled = sslVerificationEnabled;
     }
 
+    public boolean isNoteEvents() { return noteEvents; }
+
+    public void setNoteEvents(boolean noteEvents) { this.noteEvents = noteEvents; }
+
+    public boolean isJobEvents() { return jobEvents; }
+
+    public void setJobEvents(boolean jobEvents) { this.jobEvents = jobEvents; }
+
+    public boolean isPipelineEvents() { return pipelineEvents; }
+
+    public void setPipelineEvents(boolean pipelineEvents) { this.pipelineEvents = pipelineEvents; }
+
+    public boolean isWikiPageEvents() { return wikiPageEvents; }
+
+    public void setWikiPageEvents(boolean wikiPageEvents) { this.wikiPageEvents = wikiPageEvents; }
 }