Skip to content

Improvements on GitlabProjectHook #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timols merged 1 commit into from
Nov 20, 2018
Merged

Improvements on GitlabProjectHook #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 34 additions & 6 deletions src/main/java/org/gitlab/api/GitlabAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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);
Expand Down Expand Up @@ -3956,7 +3984,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,
Expand All @@ -3977,7 +4005,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,
Expand Down
34 changes: 30 additions & 4 deletions src/main/java/org/gitlab/api/models/GitlabProjectHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand All @@ -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; }
}