From a20320330f9a3c3dd9e7239c1a3ff45b9d4529e0 Mon Sep 17 00:00:00 2001 From: "ryan.neal" Date: Wed, 25 Aug 2021 13:11:26 +0100 Subject: [PATCH 1/3] fix: added missing boolean --- .../org/gitlab4j/api/models/ProjectHook.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/models/ProjectHook.java b/src/main/java/org/gitlab4j/api/models/ProjectHook.java index b28f82919..e07de9057 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectHook.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectHook.java @@ -28,6 +28,8 @@ public class ProjectHook { private Boolean confidentialNoteEvents; private String pushEventsBranchFilter; + private Boolean deploymentEvents; + public Boolean getBuildEvents() { return buildEvents; } @@ -83,7 +85,7 @@ public Boolean getNoteEvents() { public void setNoteEvents(Boolean noteEvents) { this.noteEvents = noteEvents; } - + public Boolean getJobEvents() { return jobEvents; } @@ -123,7 +125,7 @@ public Boolean getTagPushEvents() { public void setTagPushEvents(Boolean tagPushEvents) { this.tagPushEvents = tagPushEvents; } - + public String getToken() { return token; } @@ -156,6 +158,14 @@ public void setRepositoryUpdateEvents(Boolean repositoryUpdateEvents) { this.repositoryUpdateEvents = repositoryUpdateEvents; } + public Boolean getDeploymentEvents() { + return deploymentEvents; + } + + public void setDeploymentEvents(Boolean deploymentEvents) { + this.deploymentEvents = deploymentEvents; + } + public Boolean getConfidentialIssuesEvents() { return confidentialIssuesEvents; } @@ -179,7 +189,7 @@ public String getPushEventsBranchFilter() { public void setPushEventsBranchFilter(String pushEventsBranchFilter) { this.pushEventsBranchFilter = pushEventsBranchFilter; } - + public ProjectHook withIssuesEvents(Boolean issuesEvents) { this.issuesEvents = issuesEvents; return (this); @@ -194,7 +204,7 @@ public ProjectHook withNoteEvents(Boolean noteEvents) { this.noteEvents = noteEvents; return (this); } - + public ProjectHook withJobEvents(Boolean jobEvents) { this.jobEvents = jobEvents; return (this); @@ -240,8 +250,14 @@ public ProjectHook withPushEventsBranchFilter(String pushEventsBranchFilter) { return (this); } + public ProjectHook withDeploymentEvents(Boolean deploymentEvents) { + this.deploymentEvents = deploymentEvents; + return (this); + } + @Override public String toString() { return (JacksonJson.toJsonString(this)); } -} \ No newline at end of file + +} From 1d48b5c0e9ec6fad035642499750c19220f25164 Mon Sep 17 00:00:00 2001 From: "ryan.neal" Date: Wed, 25 Aug 2021 13:18:02 +0100 Subject: [PATCH 2/3] fix: added functionality to ProjectApi --- src/main/java/org/gitlab4j/api/ProjectApi.java | 1 + src/test/resources/org/gitlab4j/api/hook.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab4j/api/ProjectApi.java b/src/main/java/org/gitlab4j/api/ProjectApi.java index bcfeaa81a..af5c22e36 100644 --- a/src/main/java/org/gitlab4j/api/ProjectApi.java +++ b/src/main/java/org/gitlab4j/api/ProjectApi.java @@ -2073,6 +2073,7 @@ public ProjectHook addHook(Object projectIdOrPath, String url, ProjectHook enabl .withParam("wiki_page_events", enabledHooks.getWikiPageEvents(), false) .withParam("enable_ssl_verification", enableSslVerification, false) .withParam("repository_update_events", enabledHooks.getRepositoryUpdateEvents(), false) + .withParam("deployment_events", enabledHooks.getDeploymentEvents(), false) .withParam("token", secretToken, false); Response response = post(Response.Status.CREATED, formData, "projects", getProjectIdOrPath(projectIdOrPath), "hooks"); return (response.readEntity(ProjectHook.class)); diff --git a/src/test/resources/org/gitlab4j/api/hook.json b/src/test/resources/org/gitlab4j/api/hook.json index 157d85018..358225668 100644 --- a/src/test/resources/org/gitlab4j/api/hook.json +++ b/src/test/resources/org/gitlab4j/api/hook.json @@ -6,6 +6,7 @@ "push_events_branch_filter": "", "issues_events": true, "confidential_issues_events": true, + "deployment_events": true, "merge_requests_events": true, "tag_push_events": true, "note_events": true, @@ -14,4 +15,4 @@ "wiki_page_events": true, "enable_ssl_verification": true, "created_at": "2012-10-12T17:04:47Z" -} \ No newline at end of file +} From d14d712c1e0509dd92d6a1460d1f78fcd81442a5 Mon Sep 17 00:00:00 2001 From: "ryan.neal" Date: Wed, 25 Aug 2021 13:26:23 +0100 Subject: [PATCH 3/3] fix: added missing releases_events value --- .../java/org/gitlab4j/api/ProjectApi.java | 1 + .../org/gitlab4j/api/models/ProjectHook.java | 19 ++++++++++++++++--- src/test/resources/org/gitlab4j/api/hook.json | 1 + 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/ProjectApi.java b/src/main/java/org/gitlab4j/api/ProjectApi.java index af5c22e36..626181e73 100644 --- a/src/main/java/org/gitlab4j/api/ProjectApi.java +++ b/src/main/java/org/gitlab4j/api/ProjectApi.java @@ -2074,6 +2074,7 @@ public ProjectHook addHook(Object projectIdOrPath, String url, ProjectHook enabl .withParam("enable_ssl_verification", enableSslVerification, false) .withParam("repository_update_events", enabledHooks.getRepositoryUpdateEvents(), false) .withParam("deployment_events", enabledHooks.getDeploymentEvents(), false) + .withParam("releases_events", enabledHooks.getReleasesEvents(), false) .withParam("token", secretToken, false); Response response = post(Response.Status.CREATED, formData, "projects", getProjectIdOrPath(projectIdOrPath), "hooks"); return (response.readEntity(ProjectHook.class)); diff --git a/src/main/java/org/gitlab4j/api/models/ProjectHook.java b/src/main/java/org/gitlab4j/api/models/ProjectHook.java index e07de9057..6993e8f4c 100644 --- a/src/main/java/org/gitlab4j/api/models/ProjectHook.java +++ b/src/main/java/org/gitlab4j/api/models/ProjectHook.java @@ -29,6 +29,7 @@ public class ProjectHook { private String pushEventsBranchFilter; private Boolean deploymentEvents; + private Boolean releasesEvents; public Boolean getBuildEvents() { return buildEvents; @@ -162,8 +163,16 @@ public Boolean getDeploymentEvents() { return deploymentEvents; } - public void setDeploymentEvents(Boolean deploymentEvents) { - this.deploymentEvents = deploymentEvents; + public void setDeploymentEvents(Boolean releasesEvents) { + this.deploymentEvents = releasesEvents; + } + + public Boolean getReleasesEvents() { + return releasesEvents; + } + + public void setReleasesEvents(Boolean releasesEvents) { + this.releasesEvents = releasesEvents; } public Boolean getConfidentialIssuesEvents() { @@ -255,9 +264,13 @@ public ProjectHook withDeploymentEvents(Boolean deploymentEvents) { return (this); } + public ProjectHook withReleasesEvents(Boolean releasesEvents) { + this.releasesEvents = releasesEvents; + return (this); + } + @Override public String toString() { return (JacksonJson.toJsonString(this)); } - } diff --git a/src/test/resources/org/gitlab4j/api/hook.json b/src/test/resources/org/gitlab4j/api/hook.json index 358225668..6ca436729 100644 --- a/src/test/resources/org/gitlab4j/api/hook.json +++ b/src/test/resources/org/gitlab4j/api/hook.json @@ -7,6 +7,7 @@ "issues_events": true, "confidential_issues_events": true, "deployment_events": true, + "releases_events": true, "merge_requests_events": true, "tag_push_events": true, "note_events": true,